From f5a1b93c49d456c574c1f2c6f483eb3dac5ce361 Mon Sep 17 00:00:00 2001 From: ohmayr Date: Tue, 14 Apr 2026 00:04:55 +0000 Subject: [PATCH] dialogflow changes --- .../google/cloud/dialogflow/__init__.py | 16 + .../google/cloud/dialogflow_v2/__init__.py | 17 +- .../services/agents/async_client.py | 72 ++- .../dialogflow_v2/services/agents/client.py | 40 +- .../services/agents/transports/base.py | 7 +- .../services/agents/transports/grpc.py | 37 +- .../agents/transports/grpc_asyncio.py | 37 +- .../services/agents/transports/rest.py | 5 +- .../services/agents/transports/rest_base.py | 5 +- .../services/answer_records/async_client.py | 46 +- .../services/answer_records/client.py | 86 ++- .../answer_records/transports/base.py | 7 +- .../answer_records/transports/grpc.py | 5 +- .../answer_records/transports/grpc_asyncio.py | 5 +- .../answer_records/transports/rest.py | 13 +- .../answer_records/transports/rest_base.py | 5 +- .../services/contexts/async_client.py | 24 +- .../dialogflow_v2/services/contexts/client.py | 8 +- .../services/contexts/transports/base.py | 7 +- .../services/contexts/transports/grpc.py | 5 +- .../contexts/transports/grpc_asyncio.py | 5 +- .../services/contexts/transports/rest.py | 5 +- .../services/contexts/transports/rest_base.py | 5 +- .../conversation_datasets/async_client.py | 68 ++- .../services/conversation_datasets/client.py | 32 +- .../conversation_datasets/transports/base.py | 7 +- .../conversation_datasets/transports/grpc.py | 31 +- .../transports/grpc_asyncio.py | 33 +- .../conversation_datasets/transports/rest.py | 9 +- .../transports/rest_base.py | 7 +- .../conversation_models/async_client.py | 88 ++- .../services/conversation_models/client.py | 44 +- .../conversation_models/transports/base.py | 7 +- .../conversation_models/transports/grpc.py | 43 +- .../transports/grpc_asyncio.py | 45 +- .../conversation_models/transports/rest.py | 9 +- .../transports/rest_base.py | 7 +- .../conversation_profiles/async_client.py | 68 ++- .../services/conversation_profiles/client.py | 68 ++- .../conversation_profiles/transports/base.py | 7 +- .../conversation_profiles/transports/grpc.py | 23 +- .../transports/grpc_asyncio.py | 25 +- .../conversation_profiles/transports/rest.py | 9 +- .../transports/rest_base.py | 7 +- .../services/conversations/async_client.py | 65 ++- .../services/conversations/client.py | 209 ++++--- .../services/conversations/transports/base.py | 7 +- .../services/conversations/transports/grpc.py | 5 +- .../conversations/transports/grpc_asyncio.py | 5 +- .../services/conversations/transports/rest.py | 5 +- .../conversations/transports/rest_base.py | 5 +- .../services/documents/async_client.py | 88 ++- .../services/documents/client.py | 48 +- .../services/documents/transports/base.py | 7 +- .../services/documents/transports/grpc.py | 45 +- .../documents/transports/grpc_asyncio.py | 45 +- .../services/documents/transports/rest.py | 5 +- .../documents/transports/rest_base.py | 5 +- .../encryption_spec_service/async_client.py | 36 +- .../encryption_spec_service/client.py | 8 +- .../transports/base.py | 7 +- .../transports/grpc.py | 5 +- .../transports/grpc_asyncio.py | 5 +- .../transports/rest.py | 5 +- .../transports/rest_base.py | 5 +- .../services/entity_types/async_client.py | 88 ++- .../services/entity_types/client.py | 48 +- .../services/entity_types/transports/base.py | 7 +- .../services/entity_types/transports/grpc.py | 45 +- .../entity_types/transports/grpc_asyncio.py | 45 +- .../services/entity_types/transports/rest.py | 5 +- .../entity_types/transports/rest_base.py | 5 +- .../services/environments/async_client.py | 56 +- .../services/environments/client.py | 36 +- .../services/environments/transports/base.py | 5 +- .../services/environments/transports/grpc.py | 3 +- .../environments/transports/grpc_asyncio.py | 3 +- .../services/environments/transports/rest.py | 27 +- .../environments/transports/rest_base.py | 3 +- .../services/fulfillments/async_client.py | 28 +- .../services/fulfillments/client.py | 8 +- .../services/fulfillments/transports/base.py | 7 +- .../services/fulfillments/transports/grpc.py | 5 +- .../fulfillments/transports/grpc_asyncio.py | 5 +- .../services/fulfillments/transports/rest.py | 5 +- .../fulfillments/transports/rest_base.py | 5 +- .../generator_evaluations/async_client.py | 42 +- .../services/generator_evaluations/client.py | 78 ++- .../generator_evaluations/transports/base.py | 7 +- .../generator_evaluations/transports/grpc.py | 7 +- .../transports/grpc_asyncio.py | 9 +- .../generator_evaluations/transports/rest.py | 9 +- .../transports/rest_base.py | 7 +- .../services/generators/async_client.py | 32 +- .../services/generators/client.py | 80 ++- .../services/generators/transports/base.py | 7 +- .../services/generators/transports/grpc.py | 5 +- .../generators/transports/grpc_asyncio.py | 5 +- .../services/generators/transports/rest.py | 5 +- .../generators/transports/rest_base.py | 5 +- .../services/intents/async_client.py | 48 +- .../dialogflow_v2/services/intents/client.py | 24 +- .../services/intents/transports/base.py | 7 +- .../services/intents/transports/grpc.py | 21 +- .../intents/transports/grpc_asyncio.py | 21 +- .../services/intents/transports/rest.py | 5 +- .../services/intents/transports/rest_base.py | 5 +- .../services/knowledge_bases/async_client.py | 32 +- .../services/knowledge_bases/client.py | 8 +- .../knowledge_bases/transports/base.py | 7 +- .../knowledge_bases/transports/grpc.py | 5 +- .../transports/grpc_asyncio.py | 5 +- .../knowledge_bases/transports/rest.py | 5 +- .../knowledge_bases/transports/rest_base.py | 5 +- .../services/participants/async_client.py | 44 +- .../services/participants/client.py | 128 ++++- .../services/participants/transports/base.py | 7 +- .../services/participants/transports/grpc.py | 5 +- .../participants/transports/grpc_asyncio.py | 5 +- .../services/participants/transports/rest.py | 5 +- .../participants/transports/rest_base.py | 5 +- .../session_entity_types/async_client.py | 32 +- .../services/session_entity_types/client.py | 8 +- .../session_entity_types/transports/base.py | 7 +- .../session_entity_types/transports/grpc.py | 7 +- .../transports/grpc_asyncio.py | 9 +- .../session_entity_types/transports/rest.py | 9 +- .../transports/rest_base.py | 7 +- .../services/sessions/async_client.py | 40 +- .../dialogflow_v2/services/sessions/client.py | 64 +-- .../services/sessions/transports/base.py | 7 +- .../services/sessions/transports/grpc.py | 5 +- .../sessions/transports/grpc_asyncio.py | 5 +- .../services/sessions/transports/rest.py | 5 +- .../services/sessions/transports/rest_base.py | 5 +- .../services/sip_trunks/async_client.py | 24 +- .../services/sip_trunks/client.py | 8 +- .../services/sip_trunks/transports/base.py | 7 +- .../services/sip_trunks/transports/grpc.py | 5 +- .../sip_trunks/transports/grpc_asyncio.py | 5 +- .../services/sip_trunks/transports/rest.py | 5 +- .../sip_trunks/transports/rest_base.py | 5 +- .../services/tools/async_client.py | 28 +- .../dialogflow_v2/services/tools/client.py | 52 +- .../services/tools/transports/base.py | 7 +- .../services/tools/transports/grpc.py | 5 +- .../services/tools/transports/grpc_asyncio.py | 5 +- .../services/tools/transports/rest.py | 5 +- .../services/tools/transports/rest_base.py | 5 +- .../services/versions/async_client.py | 68 ++- .../dialogflow_v2/services/versions/client.py | 52 +- .../services/versions/transports/base.py | 7 +- .../services/versions/transports/grpc.py | 5 +- .../versions/transports/grpc_asyncio.py | 5 +- .../services/versions/transports/rest.py | 29 +- .../services/versions/transports/rest_base.py | 5 +- .../cloud/dialogflow_v2/types/__init__.py | 22 + .../dialogflow_v2/types/answer_record.py | 42 +- .../cloud/dialogflow_v2/types/audio_config.py | 51 +- .../cloud/dialogflow_v2/types/ces_app.py | 54 ++ .../cloud/dialogflow_v2/types/ces_tool.py | 54 ++ .../cloud/dialogflow_v2/types/context.py | 24 +- .../cloud/dialogflow_v2/types/conversation.py | 179 +++++- .../types/conversation_dataset.py | 1 - .../dialogflow_v2/types/conversation_event.py | 7 +- .../types/conversation_profile.py | 67 ++- .../cloud/dialogflow_v2/types/document.py | 21 +- .../cloud/dialogflow_v2/types/entity_type.py | 10 +- .../cloud/dialogflow_v2/types/environment.py | 41 +- .../cloud/dialogflow_v2/types/fulfillment.py | 4 +- .../cloud/dialogflow_v2/types/generator.py | 48 +- .../types/generator_evaluation.py | 1 - .../types/human_agent_assistant_event.py | 1 - .../cloud/dialogflow_v2/types/intent.py | 33 +- .../dialogflow_v2/types/knowledge_base.py | 22 +- .../cloud/dialogflow_v2/types/participant.py | 519 ++++++++++++++++- .../cloud/dialogflow_v2/types/session.py | 73 ++- .../types/session_entity_type.py | 1 - .../cloud/dialogflow_v2/types/tool_call.py | 64 +++ .../cloud/dialogflow_v2/types/toolset.py | 63 +++ .../dialogflow_v2/types/validation_result.py | 23 +- .../cloud/dialogflow_v2/types/version.py | 32 +- .../cloud/dialogflow_v2/types/webhook.py | 7 +- .../cloud/dialogflow_v2beta1/__init__.py | 17 +- .../services/agents/async_client.py | 72 ++- .../services/agents/client.py | 40 +- .../services/agents/transports/base.py | 7 +- .../services/agents/transports/grpc.py | 37 +- .../agents/transports/grpc_asyncio.py | 37 +- .../services/agents/transports/rest.py | 5 +- .../services/agents/transports/rest_base.py | 5 +- .../services/answer_records/async_client.py | 54 +- .../services/answer_records/client.py | 94 ++- .../answer_records/transports/base.py | 7 +- .../answer_records/transports/grpc.py | 5 +- .../answer_records/transports/grpc_asyncio.py | 5 +- .../answer_records/transports/rest.py | 21 +- .../answer_records/transports/rest_base.py | 5 +- .../services/contexts/async_client.py | 64 +-- .../services/contexts/client.py | 48 +- .../services/contexts/transports/base.py | 7 +- .../services/contexts/transports/grpc.py | 5 +- .../contexts/transports/grpc_asyncio.py | 5 +- .../services/contexts/transports/rest.py | 5 +- .../services/contexts/transports/rest_base.py | 5 +- .../conversation_profiles/async_client.py | 68 ++- .../services/conversation_profiles/client.py | 68 ++- .../conversation_profiles/transports/base.py | 7 +- .../conversation_profiles/transports/grpc.py | 23 +- .../transports/grpc_asyncio.py | 25 +- .../conversation_profiles/transports/rest.py | 9 +- .../transports/rest_base.py | 7 +- .../services/conversations/async_client.py | 65 ++- .../services/conversations/client.py | 209 ++++--- .../services/conversations/transports/base.py | 7 +- .../services/conversations/transports/grpc.py | 5 +- .../conversations/transports/grpc_asyncio.py | 5 +- .../services/conversations/transports/rest.py | 5 +- .../conversations/transports/rest_base.py | 5 +- .../services/documents/async_client.py | 84 ++- .../services/documents/client.py | 48 +- .../services/documents/transports/base.py | 7 +- .../services/documents/transports/grpc.py | 45 +- .../documents/transports/grpc_asyncio.py | 45 +- .../services/documents/transports/rest.py | 5 +- .../documents/transports/rest_base.py | 5 +- .../encryption_spec_service/async_client.py | 36 +- .../encryption_spec_service/client.py | 8 +- .../transports/base.py | 7 +- .../transports/grpc.py | 5 +- .../transports/grpc_asyncio.py | 5 +- .../transports/rest.py | 5 +- .../transports/rest_base.py | 5 +- .../services/entity_types/async_client.py | 120 ++-- .../services/entity_types/client.py | 80 ++- .../services/entity_types/transports/base.py | 7 +- .../services/entity_types/transports/grpc.py | 45 +- .../entity_types/transports/grpc_asyncio.py | 45 +- .../services/entity_types/transports/rest.py | 5 +- .../entity_types/transports/rest_base.py | 5 +- .../services/environments/async_client.py | 56 +- .../services/environments/client.py | 36 +- .../services/environments/transports/base.py | 5 +- .../services/environments/transports/grpc.py | 3 +- .../environments/transports/grpc_asyncio.py | 3 +- .../services/environments/transports/rest.py | 27 +- .../environments/transports/rest_base.py | 3 +- .../services/fulfillments/async_client.py | 32 +- .../services/fulfillments/client.py | 12 +- .../services/fulfillments/transports/base.py | 7 +- .../services/fulfillments/transports/grpc.py | 5 +- .../fulfillments/transports/grpc_asyncio.py | 5 +- .../services/fulfillments/transports/rest.py | 5 +- .../fulfillments/transports/rest_base.py | 5 +- .../generator_evaluations/async_client.py | 42 +- .../services/generator_evaluations/client.py | 78 ++- .../generator_evaluations/transports/base.py | 7 +- .../generator_evaluations/transports/grpc.py | 7 +- .../transports/grpc_asyncio.py | 9 +- .../generator_evaluations/transports/rest.py | 9 +- .../transports/rest_base.py | 7 +- .../services/generators/async_client.py | 32 +- .../services/generators/client.py | 80 ++- .../services/generators/transports/base.py | 7 +- .../services/generators/transports/grpc.py | 5 +- .../generators/transports/grpc_asyncio.py | 5 +- .../services/generators/transports/rest.py | 5 +- .../generators/transports/rest_base.py | 5 +- .../services/intents/async_client.py | 68 ++- .../services/intents/client.py | 44 +- .../services/intents/transports/base.py | 7 +- .../services/intents/transports/grpc.py | 21 +- .../intents/transports/grpc_asyncio.py | 21 +- .../services/intents/transports/rest.py | 5 +- .../services/intents/transports/rest_base.py | 5 +- .../services/knowledge_bases/async_client.py | 32 +- .../services/knowledge_bases/client.py | 8 +- .../knowledge_bases/transports/base.py | 7 +- .../knowledge_bases/transports/grpc.py | 5 +- .../transports/grpc_asyncio.py | 5 +- .../knowledge_bases/transports/rest.py | 5 +- .../knowledge_bases/transports/rest_base.py | 5 +- .../services/participants/async_client.py | 44 +- .../services/participants/client.py | 128 ++++- .../services/participants/transports/base.py | 7 +- .../services/participants/transports/grpc.py | 5 +- .../participants/transports/grpc_asyncio.py | 5 +- .../services/participants/transports/rest.py | 5 +- .../participants/transports/rest_base.py | 5 +- .../services/phone_numbers/async_client.py | 31 +- .../services/phone_numbers/client.py | 31 +- .../services/phone_numbers/transports/base.py | 7 +- .../services/phone_numbers/transports/grpc.py | 5 +- .../phone_numbers/transports/grpc_asyncio.py | 5 +- .../services/phone_numbers/transports/rest.py | 5 +- .../phone_numbers/transports/rest_base.py | 5 +- .../session_entity_types/async_client.py | 64 +-- .../services/session_entity_types/client.py | 40 +- .../session_entity_types/transports/base.py | 7 +- .../session_entity_types/transports/grpc.py | 7 +- .../transports/grpc_asyncio.py | 9 +- .../session_entity_types/transports/rest.py | 9 +- .../transports/rest_base.py | 7 +- .../services/sessions/async_client.py | 48 +- .../services/sessions/client.py | 72 ++- .../services/sessions/transports/base.py | 7 +- .../services/sessions/transports/grpc.py | 5 +- .../sessions/transports/grpc_asyncio.py | 5 +- .../services/sessions/transports/rest.py | 5 +- .../services/sessions/transports/rest_base.py | 5 +- .../services/sip_trunks/async_client.py | 24 +- .../services/sip_trunks/client.py | 8 +- .../services/sip_trunks/transports/base.py | 7 +- .../services/sip_trunks/transports/grpc.py | 5 +- .../sip_trunks/transports/grpc_asyncio.py | 5 +- .../services/sip_trunks/transports/rest.py | 5 +- .../sip_trunks/transports/rest_base.py | 5 +- .../services/tools/async_client.py | 28 +- .../services/tools/client.py | 52 +- .../services/tools/transports/base.py | 7 +- .../services/tools/transports/grpc.py | 5 +- .../services/tools/transports/grpc_asyncio.py | 5 +- .../services/tools/transports/rest.py | 5 +- .../services/tools/transports/rest_base.py | 5 +- .../services/versions/async_client.py | 68 ++- .../services/versions/client.py | 52 +- .../services/versions/transports/base.py | 7 +- .../services/versions/transports/grpc.py | 5 +- .../versions/transports/grpc_asyncio.py | 5 +- .../services/versions/transports/rest.py | 29 +- .../services/versions/transports/rest_base.py | 5 +- .../dialogflow_v2beta1/types/__init__.py | 22 + .../dialogflow_v2beta1/types/answer_record.py | 42 +- .../dialogflow_v2beta1/types/audio_config.py | 63 ++- .../cloud/dialogflow_v2beta1/types/ces_app.py | 54 ++ .../dialogflow_v2beta1/types/ces_tool.py | 54 ++ .../cloud/dialogflow_v2beta1/types/context.py | 72 +-- .../dialogflow_v2beta1/types/conversation.py | 179 +++++- .../types/conversation_event.py | 7 +- .../types/conversation_profile.py | 75 ++- .../dialogflow_v2beta1/types/document.py | 21 +- .../dialogflow_v2beta1/types/entity_type.py | 50 +- .../dialogflow_v2beta1/types/environment.py | 41 +- .../dialogflow_v2beta1/types/fulfillment.py | 8 +- .../dialogflow_v2beta1/types/generator.py | 48 +- .../types/generator_evaluation.py | 1 - .../types/human_agent_assistant_event.py | 1 - .../cloud/dialogflow_v2beta1/types/intent.py | 89 ++- .../types/knowledge_base.py | 22 +- .../dialogflow_v2beta1/types/participant.py | 533 ++++++++++++++++-- .../dialogflow_v2beta1/types/phone_number.py | 48 ++ .../cloud/dialogflow_v2beta1/types/session.py | 101 ++-- .../types/session_entity_type.py | 41 +- .../dialogflow_v2beta1/types/tool_call.py | 64 +++ .../cloud/dialogflow_v2beta1/types/toolset.py | 63 +++ .../types/validation_result.py | 23 +- .../cloud/dialogflow_v2beta1/types/version.py | 32 +- .../cloud/dialogflow_v2beta1/types/webhook.py | 15 +- ..._v2_generated_agents_export_agent_async.py | 4 +- ..._v2_generated_agents_import_agent_async.py | 4 +- ...v2_generated_agents_restore_agent_async.py | 4 +- ...w_v2_generated_agents_train_agent_async.py | 4 +- ...asets_create_conversation_dataset_async.py | 4 +- ...asets_delete_conversation_dataset_async.py | 4 +- ...datasets_import_conversation_data_async.py | 4 +- ..._models_create_conversation_model_async.py | 4 +- ...ate_conversation_model_evaluation_async.py | 4 +- ..._models_delete_conversation_model_async.py | 4 +- ..._models_deploy_conversation_model_async.py | 4 +- ...odels_undeploy_conversation_model_async.py | 4 +- ...s_clear_suggestion_feature_config_async.py | 4 +- ...les_set_suggestion_feature_config_async.py | 4 +- ...nerated_documents_create_document_async.py | 4 +- ...nerated_documents_delete_document_async.py | 4 +- ...nerated_documents_export_document_async.py | 4 +- ...erated_documents_import_documents_async.py | 4 +- ...nerated_documents_reload_document_async.py | 4 +- ...nerated_documents_update_document_async.py | 4 +- ...ervice_initialize_encryption_spec_async.py | 4 +- ...ntity_types_batch_create_entities_async.py | 4 +- ...ntity_types_batch_delete_entities_async.py | 4 +- ...y_types_batch_delete_entity_types_async.py | 4 +- ...ntity_types_batch_update_entities_async.py | 4 +- ...y_types_batch_update_entity_types_async.py | 4 +- ...tions_create_generator_evaluation_async.py | 4 +- ...ated_intents_batch_delete_intents_async.py | 4 +- ...ated_intents_batch_update_intents_async.py | 4 +- ...ta1_generated_agents_export_agent_async.py | 4 +- ...ta1_generated_agents_import_agent_async.py | 4 +- ...a1_generated_agents_restore_agent_async.py | 4 +- ...eta1_generated_agents_train_agent_async.py | 4 +- ...s_clear_suggestion_feature_config_async.py | 4 +- ...les_set_suggestion_feature_config_async.py | 4 +- ...nerated_documents_create_document_async.py | 4 +- ...nerated_documents_delete_document_async.py | 4 +- ...erated_documents_import_documents_async.py | 4 +- ...nerated_documents_reload_document_async.py | 4 +- ...nerated_documents_update_document_async.py | 4 +- ...ervice_initialize_encryption_spec_async.py | 4 +- ...ntity_types_batch_create_entities_async.py | 4 +- ...ntity_types_batch_delete_entities_async.py | 4 +- ...y_types_batch_delete_entity_types_async.py | 4 +- ...ntity_types_batch_update_entities_async.py | 4 +- ...y_types_batch_update_entity_types_async.py | 4 +- ...tions_create_generator_evaluation_async.py | 4 +- ...ated_intents_batch_delete_intents_async.py | 4 +- ...ated_intents_batch_update_intents_async.py | 4 +- packages/google-cloud-dialogflow/setup.py | 6 +- .../testing/constraints-3.9.txt | 7 +- .../unit/gapic/dialogflow_v2/test_agents.py | 7 +- .../dialogflow_v2/test_answer_records.py | 155 +++-- .../unit/gapic/dialogflow_v2/test_contexts.py | 7 +- .../test_conversation_datasets.py | 7 +- .../dialogflow_v2/test_conversation_models.py | 7 +- .../test_conversation_profiles.py | 9 +- .../gapic/dialogflow_v2/test_conversations.py | 370 +++++++++--- .../gapic/dialogflow_v2/test_documents.py | 7 +- .../test_encryption_spec_service.py | 7 +- .../gapic/dialogflow_v2/test_entity_types.py | 7 +- .../gapic/dialogflow_v2/test_environments.py | 7 +- .../gapic/dialogflow_v2/test_fulfillments.py | 7 +- .../test_generator_evaluations.py | 178 ++++-- .../gapic/dialogflow_v2/test_generators.py | 177 +++++- .../unit/gapic/dialogflow_v2/test_intents.py | 7 +- .../dialogflow_v2/test_knowledge_bases.py | 7 +- .../gapic/dialogflow_v2/test_participants.py | 197 +++++-- .../test_session_entity_types.py | 7 +- .../unit/gapic/dialogflow_v2/test_sessions.py | 7 +- .../gapic/dialogflow_v2/test_sip_trunks.py | 7 +- .../unit/gapic/dialogflow_v2/test_tools.py | 7 +- .../unit/gapic/dialogflow_v2/test_versions.py | 7 +- .../gapic/dialogflow_v2beta1/test_agents.py | 7 +- .../dialogflow_v2beta1/test_answer_records.py | 167 ++++-- .../gapic/dialogflow_v2beta1/test_contexts.py | 7 +- .../test_conversation_profiles.py | 32 +- .../dialogflow_v2beta1/test_conversations.py | 371 +++++++++--- .../dialogflow_v2beta1/test_documents.py | 7 +- .../test_encryption_spec_service.py | 7 +- .../dialogflow_v2beta1/test_entity_types.py | 7 +- .../dialogflow_v2beta1/test_environments.py | 7 +- .../dialogflow_v2beta1/test_fulfillments.py | 7 +- .../test_generator_evaluations.py | 178 ++++-- .../dialogflow_v2beta1/test_generators.py | 177 +++++- .../gapic/dialogflow_v2beta1/test_intents.py | 7 +- .../test_knowledge_bases.py | 7 +- .../dialogflow_v2beta1/test_participants.py | 209 +++++-- .../dialogflow_v2beta1/test_phone_numbers.py | 63 ++- .../test_session_entity_types.py | 7 +- .../gapic/dialogflow_v2beta1/test_sessions.py | 7 +- .../dialogflow_v2beta1/test_sip_trunks.py | 7 +- .../gapic/dialogflow_v2beta1/test_tools.py | 7 +- .../gapic/dialogflow_v2beta1/test_versions.py | 7 +- 452 files changed, 8157 insertions(+), 4503 deletions(-) create mode 100644 packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/ces_app.py create mode 100644 packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/ces_tool.py create mode 100644 packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/toolset.py create mode 100644 packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/ces_app.py create mode 100644 packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/ces_tool.py create mode 100644 packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/toolset.py diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow/__init__.py index df8571957553..60ec39e82c6c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow/__init__.py @@ -158,6 +158,8 @@ TelephonyDtmfEvents, VoiceSelectionParams, ) +from google.cloud.dialogflow_v2.types.ces_app import CesAppSpec +from google.cloud.dialogflow_v2.types.ces_tool import CesToolSpec from google.cloud.dialogflow_v2.types.context import ( Context, CreateContextRequest, @@ -186,6 +188,7 @@ ListMessagesRequest, ListMessagesResponse, SearchKnowledgeAnswer, + SearchKnowledgeDebugInfo, SearchKnowledgeRequest, SearchKnowledgeResponse, SuggestConversationSummaryRequest, @@ -382,20 +385,24 @@ AudioInput, AutomatedAgentReply, CreateParticipantRequest, + DatastoreResponseReason, DialogflowAssistAnswer, DtmfParameters, FaqAnswer, GenerateSuggestionsResponse, GetParticipantRequest, + IngestedContextReferenceDebugInfo, InputTextConfig, IntentSuggestion, KnowledgeAssistAnswer, + KnowledgeAssistDebugInfo, ListParticipantsRequest, ListParticipantsResponse, Message, MessageAnnotation, OutputAudio, Participant, + ServiceLatency, SmartReplyAnswer, StreamingAnalyzeContentRequest, StreamingAnalyzeContentResponse, @@ -456,6 +463,7 @@ UpdateToolRequest, ) from google.cloud.dialogflow_v2.types.tool_call import ToolCall, ToolCallResult +from google.cloud.dialogflow_v2.types.toolset import ToolsetTool from google.cloud.dialogflow_v2.types.validation_result import ( ValidationError, ValidationResult, @@ -554,6 +562,8 @@ "SpeechModelVariant", "SsmlVoiceGender", "TelephonyDtmf", + "CesAppSpec", + "CesToolSpec", "Context", "CreateContextRequest", "DeleteAllContextsRequest", @@ -579,6 +589,7 @@ "ListMessagesRequest", "ListMessagesResponse", "SearchKnowledgeAnswer", + "SearchKnowledgeDebugInfo", "SearchKnowledgeRequest", "SearchKnowledgeResponse", "SuggestConversationSummaryRequest", @@ -751,15 +762,18 @@ "FaqAnswer", "GenerateSuggestionsResponse", "GetParticipantRequest", + "IngestedContextReferenceDebugInfo", "InputTextConfig", "IntentSuggestion", "KnowledgeAssistAnswer", + "KnowledgeAssistDebugInfo", "ListParticipantsRequest", "ListParticipantsResponse", "Message", "MessageAnnotation", "OutputAudio", "Participant", + "ServiceLatency", "SmartReplyAnswer", "StreamingAnalyzeContentRequest", "StreamingAnalyzeContentResponse", @@ -774,6 +788,7 @@ "SuggestSmartRepliesRequest", "SuggestSmartRepliesResponse", "UpdateParticipantRequest", + "DatastoreResponseReason", "CloudConversationDebuggingInfo", "DetectIntentRequest", "DetectIntentResponse", @@ -812,6 +827,7 @@ "UpdateToolRequest", "ToolCall", "ToolCallResult", + "ToolsetTool", "ValidationError", "ValidationResult", "CreateVersionRequest", diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/__init__.py index 831da88affb4..cea172a1b809 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/__init__.py @@ -16,7 +16,6 @@ import sys import google.api_core as api_core - from google.cloud.dialogflow_v2 import gapic_version as package_version __version__ = package_version.__version__ @@ -109,6 +108,8 @@ TelephonyDtmfEvents, VoiceSelectionParams, ) +from .types.ces_app import CesAppSpec +from .types.ces_tool import CesToolSpec from .types.context import ( Context, CreateContextRequest, @@ -137,6 +138,7 @@ ListMessagesRequest, ListMessagesResponse, SearchKnowledgeAnswer, + SearchKnowledgeDebugInfo, SearchKnowledgeRequest, SearchKnowledgeResponse, SuggestConversationSummaryRequest, @@ -329,20 +331,24 @@ AudioInput, AutomatedAgentReply, CreateParticipantRequest, + DatastoreResponseReason, DialogflowAssistAnswer, DtmfParameters, FaqAnswer, GenerateSuggestionsResponse, GetParticipantRequest, + IngestedContextReferenceDebugInfo, InputTextConfig, IntentSuggestion, KnowledgeAssistAnswer, + KnowledgeAssistDebugInfo, ListParticipantsRequest, ListParticipantsResponse, Message, MessageAnnotation, OutputAudio, Participant, + ServiceLatency, SmartReplyAnswer, StreamingAnalyzeContentRequest, StreamingAnalyzeContentResponse, @@ -403,6 +409,7 @@ UpdateToolRequest, ) from .types.tool_call import ToolCall, ToolCallResult +from .types.toolset import ToolsetTool from .types.validation_result import ValidationError, ValidationResult from .types.version import ( CreateVersionRequest, @@ -561,6 +568,8 @@ def _get_version(dependency_name): "BatchUpdateEntityTypesResponse", "BatchUpdateIntentsRequest", "BatchUpdateIntentsResponse", + "CesAppSpec", + "CesToolSpec", "ClearSuggestionFeatureConfigOperationMetadata", "ClearSuggestionFeatureConfigRequest", "CloudConversationDebuggingInfo", @@ -603,6 +612,7 @@ def _get_version(dependency_name): "CreateToolRequest", "CreateVersionRequest", "CustomPronunciationParams", + "DatastoreResponseReason", "DeleteAgentRequest", "DeleteAllContextsRequest", "DeleteContextRequest", @@ -702,6 +712,7 @@ def _get_version(dependency_name): "InferenceParameter", "IngestContextReferencesRequest", "IngestContextReferencesResponse", + "IngestedContextReferenceDebugInfo", "InitializeEncryptionSpecMetadata", "InitializeEncryptionSpecRequest", "InitializeEncryptionSpecResponse", @@ -715,6 +726,7 @@ def _get_version(dependency_name): "IntentView", "IntentsClient", "KnowledgeAssistAnswer", + "KnowledgeAssistDebugInfo", "KnowledgeBase", "KnowledgeBasesClient", "KnowledgeOperationMetadata", @@ -778,11 +790,13 @@ def _get_version(dependency_name): "SearchAgentsRequest", "SearchAgentsResponse", "SearchKnowledgeAnswer", + "SearchKnowledgeDebugInfo", "SearchKnowledgeRequest", "SearchKnowledgeResponse", "Sentiment", "SentimentAnalysisRequestConfig", "SentimentAnalysisResult", + "ServiceLatency", "SessionEntityType", "SessionEntityTypesClient", "SessionsClient", @@ -832,6 +846,7 @@ def _get_version(dependency_name): "ToolCall", "ToolCallResult", "ToolsClient", + "ToolsetTool", "TrainAgentRequest", "TriggerEvent", "UndeployConversationModelOperationMetadata", diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/async_client.py index dfa121c06529..8b80bf8c00d3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -48,12 +47,11 @@ import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.agents import pagers from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import AgentsClient from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport @@ -83,18 +81,18 @@ class AgentsAsyncClient: agent_path = staticmethod(AgentsClient.agent_path) parse_agent_path = staticmethod(AgentsClient.parse_agent_path) - common_billing_account_path = staticmethod(AgentsClient.common_billing_account_path) - parse_common_billing_account_path = staticmethod( - AgentsClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(AgentsClient.common_folder_path) - parse_common_folder_path = staticmethod(AgentsClient.parse_common_folder_path) + common_project_path = staticmethod(AgentsClient.common_project_path) + parse_common_project_path = staticmethod(AgentsClient.parse_common_project_path) common_organization_path = staticmethod(AgentsClient.common_organization_path) parse_common_organization_path = staticmethod( AgentsClient.parse_common_organization_path ) - common_project_path = staticmethod(AgentsClient.common_project_path) - parse_common_project_path = staticmethod(AgentsClient.parse_common_project_path) + common_folder_path = staticmethod(AgentsClient.common_folder_path) + parse_common_folder_path = staticmethod(AgentsClient.parse_common_folder_path) + common_billing_account_path = staticmethod(AgentsClient.common_billing_account_path) + parse_common_billing_account_path = staticmethod( + AgentsClient.parse_common_billing_account_path + ) common_location_path = staticmethod(AgentsClient.common_location_path) parse_common_location_path = staticmethod(AgentsClient.parse_common_location_path) @@ -788,10 +786,10 @@ async def train_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -818,11 +816,11 @@ async def sample_train_agent(): ) # Make the request - operation = client.train_agent(request=request) + operation = await client.train_agent(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -935,10 +933,10 @@ async def export_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse] .. code-block:: python @@ -962,11 +960,11 @@ async def sample_export_agent(): ) # Make the request - operation = client.export_agent(request=request) + operation = await client.export_agent(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1081,10 +1079,10 @@ async def import_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ The operation only tracks when importing is complete, not when it is done training. @@ -1115,11 +1113,11 @@ async def sample_import_agent(): ) # Make the request - operation = client.import_agent(request=request) + operation = await client.import_agent(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1216,10 +1214,10 @@ async def restore_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ The operation only tracks when restoring is complete, not when it is done training. @@ -1250,11 +1248,11 @@ async def sample_restore_agent(): ) # Make the request - operation = client.restore_agent(request=request) + operation = await client.restore_agent(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/client.py index ac5914e8e6ce..d18ff532ec81 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -65,12 +64,11 @@ import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.agents import pagers from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport from .transports.grpc import AgentsGrpcTransport @@ -1210,10 +1208,10 @@ def train_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -1354,10 +1352,10 @@ def export_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse] .. code-block:: python @@ -1497,10 +1495,10 @@ def import_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ The operation only tracks when importing is complete, not when it is done training. @@ -1630,10 +1628,10 @@ def restore_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ The operation only tracks when restoring is complete, not when it is done training. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/base.py index 7c6cfdbbd906..e2245e0a99bf 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/base.py @@ -24,13 +24,12 @@ from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc.py index a0ab4eef31e2..c083e939adc0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc.py @@ -27,13 +27,12 @@ from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2.types import agent, validation_result +from google.cloud.dialogflow_v2.types import agent as gcd_agent from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2.types import agent, validation_result -from google.cloud.dialogflow_v2.types import agent as gcd_agent - from .base import DEFAULT_CLIENT_INFO, AgentsTransport try: @@ -467,10 +466,10 @@ def train_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -507,10 +506,10 @@ def export_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse] Returns: Callable[[~.ExportAgentRequest], @@ -554,10 +553,10 @@ def import_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ The operation only tracks when importing is complete, not when it is done training. @@ -606,10 +605,10 @@ def restore_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ The operation only tracks when restoring is complete, not when it is done training. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc_asyncio.py index 166fa56c684d..85a649096357 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc_asyncio.py @@ -29,14 +29,13 @@ 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.dialogflow_v2.types import agent, validation_result +from google.cloud.dialogflow_v2.types import agent as gcd_agent from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2.types import agent, validation_result -from google.cloud.dialogflow_v2.types import agent as gcd_agent - from .base import DEFAULT_CLIENT_INFO, AgentsTransport from .grpc import AgentsGrpcTransport @@ -479,10 +478,10 @@ def train_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -519,10 +518,10 @@ def export_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse] Returns: Callable[[~.ExportAgentRequest], @@ -566,10 +565,10 @@ def import_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ The operation only tracks when importing is complete, not when it is done training. @@ -618,10 +617,10 @@ def restore_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ The operation only tracks when restoring is complete, not when it is done training. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest.py index ca4e6cb19c03..2742115ed91c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest.py @@ -26,14 +26,13 @@ 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.dialogflow_v2.types import agent, validation_result +from google.cloud.dialogflow_v2.types import agent as gcd_agent from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import agent, validation_result -from google.cloud.dialogflow_v2.types import agent as gcd_agent - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAgentsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest_base.py index a06646e68ecd..89243ee0d25c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest_base.py @@ -19,13 +19,12 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2.types import agent, validation_result +from google.cloud.dialogflow_v2.types import agent as gcd_agent 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.dialogflow_v2.types import agent, validation_result -from google.cloud.dialogflow_v2.types import agent as gcd_agent - from .base import DEFAULT_CLIENT_INFO, AgentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/async_client.py index 3af188307ef1..2af7434ca8ea 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -45,12 +44,11 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.answer_records import pagers from google.cloud.dialogflow_v2.types import answer_record from google.cloud.dialogflow_v2.types import answer_record as gcd_answer_record +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import AnswerRecordsClient from .transports.base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport @@ -80,6 +78,12 @@ class AnswerRecordsAsyncClient: _DEFAULT_ENDPOINT_TEMPLATE = AnswerRecordsClient._DEFAULT_ENDPOINT_TEMPLATE _DEFAULT_UNIVERSE = AnswerRecordsClient._DEFAULT_UNIVERSE + app_path = staticmethod(AnswerRecordsClient.app_path) + parse_app_path = staticmethod(AnswerRecordsClient.parse_app_path) + ces_tool_path = staticmethod(AnswerRecordsClient.ces_tool_path) + parse_ces_tool_path = staticmethod(AnswerRecordsClient.parse_ces_tool_path) + toolset_path = staticmethod(AnswerRecordsClient.toolset_path) + parse_toolset_path = staticmethod(AnswerRecordsClient.parse_toolset_path) answer_record_path = staticmethod(AnswerRecordsClient.answer_record_path) parse_answer_record_path = staticmethod( AnswerRecordsClient.parse_answer_record_path @@ -90,15 +94,9 @@ class AnswerRecordsAsyncClient: parse_intent_path = staticmethod(AnswerRecordsClient.parse_intent_path) tool_path = staticmethod(AnswerRecordsClient.tool_path) parse_tool_path = staticmethod(AnswerRecordsClient.parse_tool_path) - common_billing_account_path = staticmethod( - AnswerRecordsClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - AnswerRecordsClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(AnswerRecordsClient.common_folder_path) - parse_common_folder_path = staticmethod( - AnswerRecordsClient.parse_common_folder_path + common_project_path = staticmethod(AnswerRecordsClient.common_project_path) + parse_common_project_path = staticmethod( + AnswerRecordsClient.parse_common_project_path ) common_organization_path = staticmethod( AnswerRecordsClient.common_organization_path @@ -106,9 +104,15 @@ class AnswerRecordsAsyncClient: parse_common_organization_path = staticmethod( AnswerRecordsClient.parse_common_organization_path ) - common_project_path = staticmethod(AnswerRecordsClient.common_project_path) - parse_common_project_path = staticmethod( - AnswerRecordsClient.parse_common_project_path + common_folder_path = staticmethod(AnswerRecordsClient.common_folder_path) + parse_common_folder_path = staticmethod( + AnswerRecordsClient.parse_common_folder_path + ) + common_billing_account_path = staticmethod( + AnswerRecordsClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + AnswerRecordsClient.parse_common_billing_account_path ) common_location_path = staticmethod(AnswerRecordsClient.common_location_path) parse_common_location_path = staticmethod( @@ -506,13 +510,13 @@ async def sample_update_answer_record(): Currently, answer record includes: - - human agent assistant article suggestion - - human agent assistant faq article + - human agent assistant article suggestion + - human agent assistant faq article It doesn't include: - - DetectIntent intent matching - - DetectIntent knowledge + - DetectIntent intent matching + - DetectIntent knowledge Answer records are not related to the conversation history in the Dialogflow Console. A Record is diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/client.py index 0c160ceb3b62..42b26cbae91f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -62,12 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.answer_records import pagers from google.cloud.dialogflow_v2.types import answer_record from google.cloud.dialogflow_v2.types import answer_record as gcd_answer_record +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport from .transports.grpc import AnswerRecordsGrpcTransport @@ -233,6 +231,76 @@ def transport(self) -> AnswerRecordsTransport: """ return self._transport + @staticmethod + def app_path( + project: str, + location: str, + app: str, + ) -> str: + """Returns a fully-qualified app string.""" + return "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + + @staticmethod + def parse_app_path(path: str) -> Dict[str, str]: + """Parses a app path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def ces_tool_path( + project: str, + location: str, + app: str, + tool: str, + ) -> str: + """Returns a fully-qualified ces_tool string.""" + return "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + + @staticmethod + def parse_ces_tool_path(path: str) -> Dict[str, str]: + """Parses a ces_tool path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/tools/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def toolset_path( + project: str, + location: str, + app: str, + toolset: str, + ) -> str: + """Returns a fully-qualified toolset string.""" + return "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + + @staticmethod + def parse_toolset_path(path: str) -> Dict[str, str]: + """Parses a toolset path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/toolsets/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def answer_record_path( project: str, @@ -987,13 +1055,13 @@ def sample_update_answer_record(): Currently, answer record includes: - - human agent assistant article suggestion - - human agent assistant faq article + - human agent assistant article suggestion + - human agent assistant faq article It doesn't include: - - DetectIntent intent matching - - DetectIntent knowledge + - DetectIntent intent matching + - DetectIntent knowledge Answer records are not related to the conversation history in the Dialogflow Console. A Record is diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/base.py index bbbabb277e4f..a103738cfb6a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/base.py @@ -23,13 +23,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import answer_record from google.cloud.dialogflow_v2.types import answer_record as gcd_answer_record +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc.py index a315242f0ad5..0131a9dc594a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc.py @@ -26,13 +26,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2.types import answer_record +from google.cloud.dialogflow_v2.types import answer_record as gcd_answer_record from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2.types import answer_record -from google.cloud.dialogflow_v2.types import answer_record as gcd_answer_record - from .base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc_asyncio.py index 06f5bd4e1fc0..c13757b65990 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc_asyncio.py @@ -28,14 +28,13 @@ 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.dialogflow_v2.types import answer_record +from google.cloud.dialogflow_v2.types import answer_record as gcd_answer_record from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2.types import answer_record -from google.cloud.dialogflow_v2.types import answer_record as gcd_answer_record - from .base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport from .grpc import AnswerRecordsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/rest.py index cb75a58db232..aabad790cd0e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/rest.py @@ -25,14 +25,13 @@ 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.dialogflow_v2.types import answer_record +from google.cloud.dialogflow_v2.types import answer_record as gcd_answer_record from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import answer_record -from google.cloud.dialogflow_v2.types import answer_record as gcd_answer_record - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAnswerRecordsRestTransport @@ -621,13 +620,13 @@ def __call__( Currently, answer record includes: - - human agent assistant article suggestion - - human agent assistant faq article + - human agent assistant article suggestion + - human agent assistant faq article It doesn't include: - - ``DetectIntent`` intent matching - - ``DetectIntent`` knowledge + - ``DetectIntent`` intent matching + - ``DetectIntent`` knowledge Answer records are not related to the conversation history in the Dialogflow Console. A Record is generated diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/rest_base.py index 26a905be10a1..66d4bf8e38ac 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/rest_base.py @@ -18,13 +18,12 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2.types import answer_record +from google.cloud.dialogflow_v2.types import answer_record as gcd_answer_record 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.dialogflow_v2.types import answer_record -from google.cloud.dialogflow_v2.types import answer_record as gcd_answer_record - from .base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/async_client.py index 2eb59ad24e67..0d78cfd5dae3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,12 +45,11 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.contexts import pagers from google.cloud.dialogflow_v2.types import context from google.cloud.dialogflow_v2.types import context as gcd_context +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import ContextsClient from .transports.base import DEFAULT_CLIENT_INFO, ContextsTransport @@ -81,20 +79,20 @@ class ContextsAsyncClient: context_path = staticmethod(ContextsClient.context_path) parse_context_path = staticmethod(ContextsClient.parse_context_path) + common_project_path = staticmethod(ContextsClient.common_project_path) + parse_common_project_path = staticmethod(ContextsClient.parse_common_project_path) + common_organization_path = staticmethod(ContextsClient.common_organization_path) + parse_common_organization_path = staticmethod( + ContextsClient.parse_common_organization_path + ) + common_folder_path = staticmethod(ContextsClient.common_folder_path) + parse_common_folder_path = staticmethod(ContextsClient.parse_common_folder_path) common_billing_account_path = staticmethod( ContextsClient.common_billing_account_path ) parse_common_billing_account_path = staticmethod( ContextsClient.parse_common_billing_account_path ) - common_folder_path = staticmethod(ContextsClient.common_folder_path) - parse_common_folder_path = staticmethod(ContextsClient.parse_common_folder_path) - common_organization_path = staticmethod(ContextsClient.common_organization_path) - parse_common_organization_path = staticmethod( - ContextsClient.parse_common_organization_path - ) - common_project_path = staticmethod(ContextsClient.common_project_path) - parse_common_project_path = staticmethod(ContextsClient.parse_common_project_path) common_location_path = staticmethod(ContextsClient.common_location_path) parse_common_location_path = staticmethod(ContextsClient.parse_common_location_path) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/client.py index 25c61646c583..a106b329ed19 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -63,12 +62,11 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.contexts import pagers from google.cloud.dialogflow_v2.types import context from google.cloud.dialogflow_v2.types import context as gcd_context +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, ContextsTransport from .transports.grpc import ContextsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/base.py index 2b52f137be60..837a75fa2dbe 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/base.py @@ -24,13 +24,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import context from google.cloud.dialogflow_v2.types import context as gcd_context +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc.py index e1a5b0d2e7e0..5880e7f2e251 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc.py @@ -27,13 +27,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2.types import context +from google.cloud.dialogflow_v2.types import context as gcd_context from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2.types import context -from google.cloud.dialogflow_v2.types import context as gcd_context - from .base import DEFAULT_CLIENT_INFO, ContextsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc_asyncio.py index c113bf4d2f6c..09c1ffb4c949 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc_asyncio.py @@ -29,14 +29,13 @@ 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.dialogflow_v2.types import context +from google.cloud.dialogflow_v2.types import context as gcd_context from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2.types import context -from google.cloud.dialogflow_v2.types import context as gcd_context - from .base import DEFAULT_CLIENT_INFO, ContextsTransport from .grpc import ContextsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest.py index d12979000b62..741a8623caf7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest.py @@ -26,14 +26,13 @@ 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.dialogflow_v2.types import context +from google.cloud.dialogflow_v2.types import context as gcd_context from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import context -from google.cloud.dialogflow_v2.types import context as gcd_context - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseContextsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest_base.py index f1201939a274..6d77fdf83a08 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest_base.py @@ -19,13 +19,12 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2.types import context +from google.cloud.dialogflow_v2.types import context as gcd_context 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.dialogflow_v2.types import context -from google.cloud.dialogflow_v2.types import context as gcd_context - from .base import DEFAULT_CLIENT_INFO, ContextsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/async_client.py index 5a316b0aeba4..748fe4f62b45 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -48,14 +47,13 @@ import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.conversation_datasets import pagers from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import ConversationDatasetsClient from .transports.base import DEFAULT_CLIENT_INFO, ConversationDatasetsTransport @@ -93,15 +91,9 @@ class ConversationDatasetsAsyncClient: parse_conversation_dataset_path = staticmethod( ConversationDatasetsClient.parse_conversation_dataset_path ) - common_billing_account_path = staticmethod( - ConversationDatasetsClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - ConversationDatasetsClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(ConversationDatasetsClient.common_folder_path) - parse_common_folder_path = staticmethod( - ConversationDatasetsClient.parse_common_folder_path + common_project_path = staticmethod(ConversationDatasetsClient.common_project_path) + parse_common_project_path = staticmethod( + ConversationDatasetsClient.parse_common_project_path ) common_organization_path = staticmethod( ConversationDatasetsClient.common_organization_path @@ -109,9 +101,15 @@ class ConversationDatasetsAsyncClient: parse_common_organization_path = staticmethod( ConversationDatasetsClient.parse_common_organization_path ) - common_project_path = staticmethod(ConversationDatasetsClient.common_project_path) - parse_common_project_path = staticmethod( - ConversationDatasetsClient.parse_common_project_path + common_folder_path = staticmethod(ConversationDatasetsClient.common_folder_path) + parse_common_folder_path = staticmethod( + ConversationDatasetsClient.parse_common_folder_path + ) + common_billing_account_path = staticmethod( + ConversationDatasetsClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + ConversationDatasetsClient.parse_common_billing_account_path ) common_location_path = staticmethod(ConversationDatasetsClient.common_location_path) parse_common_location_path = staticmethod( @@ -338,10 +336,10 @@ async def create_conversation_dataset( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [CreateConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata] - - ``response``: - [ConversationDataset][google.cloud.dialogflow.v2.ConversationDataset] + - ``metadata``: + [CreateConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata] + - ``response``: + [ConversationDataset][google.cloud.dialogflow.v2.ConversationDataset] .. code-block:: python @@ -368,11 +366,11 @@ async def sample_create_conversation_dataset(): ) # Make the request - operation = client.create_conversation_dataset(request=request) + operation = await client.create_conversation_dataset(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -744,10 +742,10 @@ async def delete_conversation_dataset( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [DeleteConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationDatasetOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [DeleteConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationDatasetOperationMetadata] + - ``response``: An `Empty + message `__ .. code-block:: python @@ -770,11 +768,11 @@ async def sample_delete_conversation_dataset(): ) # Make the request - operation = client.delete_conversation_dataset(request=request) + operation = await client.delete_conversation_dataset(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -892,10 +890,10 @@ async def import_conversation_data( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [ImportConversationDataOperationMetadata][google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata] - - ``response``: - [ImportConversationDataOperationResponse][google.cloud.dialogflow.v2.ImportConversationDataOperationResponse] + - ``metadata``: + [ImportConversationDataOperationMetadata][google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata] + - ``response``: + [ImportConversationDataOperationResponse][google.cloud.dialogflow.v2.ImportConversationDataOperationResponse] .. code-block:: python @@ -922,11 +920,11 @@ async def sample_import_conversation_data(): ) # Make the request - operation = client.import_conversation_data(request=request) + operation = await client.import_conversation_data(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/client.py index 00faa1435fc3..4a102fa31f31 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -65,14 +64,13 @@ import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.conversation_datasets import pagers from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, ConversationDatasetsTransport from .transports.grpc import ConversationDatasetsGrpcTransport @@ -767,10 +765,10 @@ def create_conversation_dataset( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [CreateConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata] - - ``response``: - [ConversationDataset][google.cloud.dialogflow.v2.ConversationDataset] + - ``metadata``: + [CreateConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata] + - ``response``: + [ConversationDataset][google.cloud.dialogflow.v2.ConversationDataset] .. code-block:: python @@ -1168,10 +1166,10 @@ def delete_conversation_dataset( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [DeleteConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationDatasetOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [DeleteConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationDatasetOperationMetadata] + - ``response``: An `Empty + message `__ .. code-block:: python @@ -1315,10 +1313,10 @@ def import_conversation_data( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [ImportConversationDataOperationMetadata][google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata] - - ``response``: - [ImportConversationDataOperationResponse][google.cloud.dialogflow.v2.ImportConversationDataOperationResponse] + - ``metadata``: + [ImportConversationDataOperationMetadata][google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata] + - ``response``: + [ImportConversationDataOperationResponse][google.cloud.dialogflow.v2.ImportConversationDataOperationResponse] .. code-block:: python diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/base.py index 6de4855b45dc..32f590b33096 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/base.py @@ -23,15 +23,14 @@ from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc.py index 47d70eec2f0e..4b990b0982cf 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc.py @@ -26,14 +26,13 @@ from google.api_core import gapic_v1, grpc_helpers, 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 - from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from .base import DEFAULT_CLIENT_INFO, ConversationDatasetsTransport @@ -366,10 +365,10 @@ def create_conversation_dataset( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [CreateConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata] - - ``response``: - [ConversationDataset][google.cloud.dialogflow.v2.ConversationDataset] + - ``metadata``: + [CreateConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata] + - ``response``: + [ConversationDataset][google.cloud.dialogflow.v2.ConversationDataset] Returns: Callable[[~.CreateConversationDatasetRequest], @@ -468,10 +467,10 @@ def delete_conversation_dataset( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [DeleteConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationDatasetOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [DeleteConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationDatasetOperationMetadata] + - ``response``: An `Empty + message `__ Returns: Callable[[~.DeleteConversationDatasetRequest], @@ -510,10 +509,10 @@ def import_conversation_data( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [ImportConversationDataOperationMetadata][google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata] - - ``response``: - [ImportConversationDataOperationResponse][google.cloud.dialogflow.v2.ImportConversationDataOperationResponse] + - ``metadata``: + [ImportConversationDataOperationMetadata][google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata] + - ``response``: + [ImportConversationDataOperationResponse][google.cloud.dialogflow.v2.ImportConversationDataOperationResponse] Returns: Callable[[~.ImportConversationDataRequest], diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc_asyncio.py index 05b6206728ab..1b537b07f33f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc_asyncio.py @@ -28,15 +28,14 @@ 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 -from grpc.experimental import aio # type: ignore - from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from grpc.experimental import aio # type: ignore from .base import DEFAULT_CLIENT_INFO, ConversationDatasetsTransport from .grpc import ConversationDatasetsGrpcTransport @@ -374,10 +373,10 @@ def create_conversation_dataset( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [CreateConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata] - - ``response``: - [ConversationDataset][google.cloud.dialogflow.v2.ConversationDataset] + - ``metadata``: + [CreateConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata] + - ``response``: + [ConversationDataset][google.cloud.dialogflow.v2.ConversationDataset] Returns: Callable[[~.CreateConversationDatasetRequest], @@ -476,10 +475,10 @@ def delete_conversation_dataset( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [DeleteConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationDatasetOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [DeleteConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationDatasetOperationMetadata] + - ``response``: An `Empty + message `__ Returns: Callable[[~.DeleteConversationDatasetRequest], @@ -519,10 +518,10 @@ def import_conversation_data( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [ImportConversationDataOperationMetadata][google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata] - - ``response``: - [ImportConversationDataOperationResponse][google.cloud.dialogflow.v2.ImportConversationDataOperationResponse] + - ``metadata``: + [ImportConversationDataOperationMetadata][google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata] + - ``response``: + [ImportConversationDataOperationResponse][google.cloud.dialogflow.v2.ImportConversationDataOperationResponse] Returns: Callable[[~.ImportConversationDataRequest], diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest.py index 9f9ff3dc351c..54511cc0b2c6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest.py @@ -25,15 +25,14 @@ 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.protobuf import json_format -from requests import __version__ as requests_version - from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import json_format +from requests import __version__ as requests_version from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationDatasetsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest_base.py index ec5976be40a7..5734527678de 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest_base.py @@ -18,14 +18,13 @@ 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.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import json_format from .base import DEFAULT_CLIENT_INFO, ConversationDatasetsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/async_client.py index 7d9d48043995..b8f6733060b1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -48,14 +47,13 @@ import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.conversation_models import pagers from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import ConversationModelsClient from .transports.base import DEFAULT_CLIENT_INFO, ConversationModelsTransport @@ -103,15 +101,9 @@ class ConversationModelsAsyncClient: ) document_path = staticmethod(ConversationModelsClient.document_path) parse_document_path = staticmethod(ConversationModelsClient.parse_document_path) - common_billing_account_path = staticmethod( - ConversationModelsClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - ConversationModelsClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(ConversationModelsClient.common_folder_path) - parse_common_folder_path = staticmethod( - ConversationModelsClient.parse_common_folder_path + common_project_path = staticmethod(ConversationModelsClient.common_project_path) + parse_common_project_path = staticmethod( + ConversationModelsClient.parse_common_project_path ) common_organization_path = staticmethod( ConversationModelsClient.common_organization_path @@ -119,9 +111,15 @@ class ConversationModelsAsyncClient: parse_common_organization_path = staticmethod( ConversationModelsClient.parse_common_organization_path ) - common_project_path = staticmethod(ConversationModelsClient.common_project_path) - parse_common_project_path = staticmethod( - ConversationModelsClient.parse_common_project_path + common_folder_path = staticmethod(ConversationModelsClient.common_folder_path) + parse_common_folder_path = staticmethod( + ConversationModelsClient.parse_common_folder_path + ) + common_billing_account_path = staticmethod( + ConversationModelsClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + ConversationModelsClient.parse_common_billing_account_path ) common_location_path = staticmethod(ConversationModelsClient.common_location_path) parse_common_location_path = staticmethod( @@ -346,10 +344,10 @@ async def create_conversation_model( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [CreateConversationModelOperationMetadata][google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata] - - ``response``: - [ConversationModel][google.cloud.dialogflow.v2.ConversationModel] + - ``metadata``: + [CreateConversationModelOperationMetadata][google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata] + - ``response``: + [ConversationModel][google.cloud.dialogflow.v2.ConversationModel] .. code-block:: python @@ -376,11 +374,11 @@ async def sample_create_conversation_model(): ) # Make the request - operation = client.create_conversation_model(request=request) + operation = await client.create_conversation_model(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -738,10 +736,10 @@ async def delete_conversation_model( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [DeleteConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [DeleteConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata] + - ``response``: An `Empty + message `__ .. code-block:: python @@ -764,11 +762,11 @@ async def sample_delete_conversation_model(): ) # Make the request - operation = client.delete_conversation_model(request=request) + operation = await client.delete_conversation_model(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -885,10 +883,10 @@ async def deploy_conversation_model( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [DeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [DeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata] + - ``response``: An `Empty + message `__ .. code-block:: python @@ -911,11 +909,11 @@ async def sample_deploy_conversation_model(): ) # Make the request - operation = client.deploy_conversation_model(request=request) + operation = await client.deploy_conversation_model(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1001,18 +999,18 @@ async def undeploy_conversation_model( r"""Undeploys a model. If the model is not deployed this method has no effect. If the model is currently being used: - - For article suggestion, article suggestion will fallback to - the default model if model is undeployed. + - For article suggestion, article suggestion will fallback to + the default model if model is undeployed. This method is a `long-running operation `__. The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [UndeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [UndeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata] + - ``response``: An `Empty + message `__ .. code-block:: python @@ -1035,11 +1033,11 @@ async def sample_undeploy_conversation_model(): ) # Make the request - operation = client.undeploy_conversation_model(request=request) + operation = await client.undeploy_conversation_model(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1397,11 +1395,11 @@ async def sample_create_conversation_model_evaluation(): ) # Make the request - operation = client.create_conversation_model_evaluation(request=request) + operation = await client.create_conversation_model_evaluation(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/client.py index 566a3ce27538..10dd50fa99a0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -65,14 +64,13 @@ import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.conversation_models import pagers from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, ConversationModelsTransport from .transports.grpc import ConversationModelsGrpcTransport @@ -827,10 +825,10 @@ def create_conversation_model( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [CreateConversationModelOperationMetadata][google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata] - - ``response``: - [ConversationModel][google.cloud.dialogflow.v2.ConversationModel] + - ``metadata``: + [CreateConversationModelOperationMetadata][google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata] + - ``response``: + [ConversationModel][google.cloud.dialogflow.v2.ConversationModel] .. code-block:: python @@ -1212,10 +1210,10 @@ def delete_conversation_model( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [DeleteConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [DeleteConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata] + - ``response``: An `Empty + message `__ .. code-block:: python @@ -1358,10 +1356,10 @@ def deploy_conversation_model( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [DeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [DeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata] + - ``response``: An `Empty + message `__ .. code-block:: python @@ -1474,18 +1472,18 @@ def undeploy_conversation_model( r"""Undeploys a model. If the model is not deployed this method has no effect. If the model is currently being used: - - For article suggestion, article suggestion will fallback to - the default model if model is undeployed. + - For article suggestion, article suggestion will fallback to + the default model if model is undeployed. This method is a `long-running operation `__. The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [UndeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [UndeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata] + - ``response``: An `Empty + message `__ .. code-block:: python diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/base.py index 835fcf9b77ac..0bddb01e4452 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/base.py @@ -23,15 +23,14 @@ from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc.py index f71efd9e42e7..5772a7a56e23 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc.py @@ -26,14 +26,13 @@ from google.api_core import gapic_v1, grpc_helpers, 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 - from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from .base import DEFAULT_CLIENT_INFO, ConversationModelsTransport @@ -363,10 +362,10 @@ def create_conversation_model( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [CreateConversationModelOperationMetadata][google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata] - - ``response``: - [ConversationModel][google.cloud.dialogflow.v2.ConversationModel] + - ``metadata``: + [CreateConversationModelOperationMetadata][google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata] + - ``response``: + [ConversationModel][google.cloud.dialogflow.v2.ConversationModel] Returns: Callable[[~.CreateConversationModelRequest], @@ -459,10 +458,10 @@ def delete_conversation_model( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [DeleteConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [DeleteConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata] + - ``response``: An `Empty + message `__ Returns: Callable[[~.DeleteConversationModelRequest], @@ -500,10 +499,10 @@ def deploy_conversation_model( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [DeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [DeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata] + - ``response``: An `Empty + message `__ Returns: Callable[[~.DeployConversationModelRequest], @@ -534,18 +533,18 @@ def undeploy_conversation_model( Undeploys a model. If the model is not deployed this method has no effect. If the model is currently being used: - - For article suggestion, article suggestion will fallback to - the default model if model is undeployed. + - For article suggestion, article suggestion will fallback to + the default model if model is undeployed. This method is a `long-running operation `__. The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [UndeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [UndeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata] + - ``response``: An `Empty + message `__ Returns: Callable[[~.UndeployConversationModelRequest], diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc_asyncio.py index 07a2013f4963..8030aa7b20ea 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc_asyncio.py @@ -28,15 +28,14 @@ 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 -from grpc.experimental import aio # type: ignore - from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from grpc.experimental import aio # type: ignore from .base import DEFAULT_CLIENT_INFO, ConversationModelsTransport from .grpc import ConversationModelsGrpcTransport @@ -371,10 +370,10 @@ def create_conversation_model( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [CreateConversationModelOperationMetadata][google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata] - - ``response``: - [ConversationModel][google.cloud.dialogflow.v2.ConversationModel] + - ``metadata``: + [CreateConversationModelOperationMetadata][google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata] + - ``response``: + [ConversationModel][google.cloud.dialogflow.v2.ConversationModel] Returns: Callable[[~.CreateConversationModelRequest], @@ -468,10 +467,10 @@ def delete_conversation_model( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [DeleteConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [DeleteConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata] + - ``response``: An `Empty + message `__ Returns: Callable[[~.DeleteConversationModelRequest], @@ -510,10 +509,10 @@ def deploy_conversation_model( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [DeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [DeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata] + - ``response``: An `Empty + message `__ Returns: Callable[[~.DeployConversationModelRequest], @@ -545,18 +544,18 @@ def undeploy_conversation_model( Undeploys a model. If the model is not deployed this method has no effect. If the model is currently being used: - - For article suggestion, article suggestion will fallback to - the default model if model is undeployed. + - For article suggestion, article suggestion will fallback to + the default model if model is undeployed. This method is a `long-running operation `__. The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [UndeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [UndeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata] + - ``response``: An `Empty + message `__ Returns: Callable[[~.UndeployConversationModelRequest], diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest.py index 510a97e00ab5..f98e14e43ae3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest.py @@ -25,15 +25,14 @@ 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.protobuf import json_format -from requests import __version__ as requests_version - from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import json_format +from requests import __version__ as requests_version from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationModelsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest_base.py index 64652b737e83..32018a22012f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest_base.py @@ -18,14 +18,13 @@ 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.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import json_format from .base import DEFAULT_CLIENT_INFO, ConversationModelsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/async_client.py index 14ac2d326a11..1b406f1e9ac3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -48,9 +47,6 @@ import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.conversation_profiles import pagers from google.cloud.dialogflow_v2.types import ( audio_config, @@ -60,6 +56,8 @@ from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import ConversationProfilesClient from .transports.base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport @@ -91,6 +89,12 @@ class ConversationProfilesAsyncClient: agent_path = staticmethod(ConversationProfilesClient.agent_path) parse_agent_path = staticmethod(ConversationProfilesClient.parse_agent_path) + cx_security_settings_path = staticmethod( + ConversationProfilesClient.cx_security_settings_path + ) + parse_cx_security_settings_path = staticmethod( + ConversationProfilesClient.parse_cx_security_settings_path + ) conversation_model_path = staticmethod( ConversationProfilesClient.conversation_model_path ) @@ -103,12 +107,6 @@ class ConversationProfilesAsyncClient: parse_conversation_profile_path = staticmethod( ConversationProfilesClient.parse_conversation_profile_path ) - cx_security_settings_path = staticmethod( - ConversationProfilesClient.cx_security_settings_path - ) - parse_cx_security_settings_path = staticmethod( - ConversationProfilesClient.parse_cx_security_settings_path - ) document_path = staticmethod(ConversationProfilesClient.document_path) parse_document_path = staticmethod(ConversationProfilesClient.parse_document_path) generator_path = staticmethod(ConversationProfilesClient.generator_path) @@ -121,15 +119,9 @@ class ConversationProfilesAsyncClient: parse_phrase_set_path = staticmethod( ConversationProfilesClient.parse_phrase_set_path ) - common_billing_account_path = staticmethod( - ConversationProfilesClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - ConversationProfilesClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(ConversationProfilesClient.common_folder_path) - parse_common_folder_path = staticmethod( - ConversationProfilesClient.parse_common_folder_path + common_project_path = staticmethod(ConversationProfilesClient.common_project_path) + parse_common_project_path = staticmethod( + ConversationProfilesClient.parse_common_project_path ) common_organization_path = staticmethod( ConversationProfilesClient.common_organization_path @@ -137,9 +129,15 @@ class ConversationProfilesAsyncClient: parse_common_organization_path = staticmethod( ConversationProfilesClient.parse_common_organization_path ) - common_project_path = staticmethod(ConversationProfilesClient.common_project_path) - parse_common_project_path = staticmethod( - ConversationProfilesClient.parse_common_project_path + common_folder_path = staticmethod(ConversationProfilesClient.common_folder_path) + parse_common_folder_path = staticmethod( + ConversationProfilesClient.parse_common_folder_path + ) + common_billing_account_path = staticmethod( + ConversationProfilesClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + ConversationProfilesClient.parse_common_billing_account_path ) common_location_path = staticmethod(ConversationProfilesClient.common_location_path) parse_common_location_path = staticmethod( @@ -1001,10 +999,10 @@ async def set_suggestion_feature_config( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata] - - ``response``: - [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile] + - ``metadata``: + [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata] + - ``response``: + [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile] If a long running operation to add or update suggestion feature config for the same conversation profile, participant role and @@ -1034,11 +1032,11 @@ async def sample_set_suggestion_feature_config(): ) # Make the request - operation = client.set_suggestion_feature_config(request=request) + operation = await client.set_suggestion_feature_config(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1182,10 +1180,10 @@ async def clear_suggestion_feature_config( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata] - - ``response``: - [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile] + - ``metadata``: + [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata] + - ``response``: + [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile] .. code-block:: python @@ -1210,11 +1208,11 @@ async def sample_clear_suggestion_feature_config(): ) # Make the request - operation = client.clear_suggestion_feature_config(request=request) + operation = await client.clear_suggestion_feature_config(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/client.py index aca7e9d59558..0e85dc3d170e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -65,9 +64,6 @@ import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.conversation_profiles import pagers from google.cloud.dialogflow_v2.types import ( audio_config, @@ -77,6 +73,8 @@ from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport from .transports.grpc import ConversationProfilesGrpcTransport @@ -257,6 +255,28 @@ def parse_agent_path(path: str) -> Dict[str, str]: m = re.match(r"^projects/(?P.+?)/agent$", path) return m.groupdict() if m else {} + @staticmethod + def cx_security_settings_path( + project: str, + location: str, + security_settings: str, + ) -> str: + """Returns a fully-qualified cx_security_settings string.""" + return "projects/{project}/locations/{location}/securitySettings/{security_settings}".format( + project=project, + location=location, + security_settings=security_settings, + ) + + @staticmethod + def parse_cx_security_settings_path(path: str) -> Dict[str, str]: + """Parses a cx_security_settings path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/securitySettings/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def conversation_model_path( project: str, @@ -299,28 +319,6 @@ def parse_conversation_profile_path(path: str) -> Dict[str, str]: ) return m.groupdict() if m else {} - @staticmethod - def cx_security_settings_path( - project: str, - location: str, - security_settings: str, - ) -> str: - """Returns a fully-qualified cx_security_settings string.""" - return "projects/{project}/locations/{location}/securitySettings/{security_settings}".format( - project=project, - location=location, - security_settings=security_settings, - ) - - @staticmethod - def parse_cx_security_settings_path(path: str) -> Dict[str, str]: - """Parses a cx_security_settings path into its component segments.""" - m = re.match( - r"^projects/(?P.+?)/locations/(?P.+?)/securitySettings/(?P.+?)$", - path, - ) - return m.groupdict() if m else {} - @staticmethod def document_path( project: str, @@ -1539,10 +1537,10 @@ def set_suggestion_feature_config( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata] - - ``response``: - [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile] + - ``metadata``: + [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata] + - ``response``: + [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile] If a long running operation to add or update suggestion feature config for the same conversation profile, participant role and @@ -1719,10 +1717,10 @@ def clear_suggestion_feature_config( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata] - - ``response``: - [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile] + - ``metadata``: + [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata] + - ``response``: + [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile] .. code-block:: python diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/base.py index 476469060e77..5517e9c609f2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/base.py @@ -24,15 +24,14 @@ from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import conversation_profile from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc.py index f60e45abd2f4..59643690d3be 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc.py @@ -27,14 +27,13 @@ from google.api_core import gapic_v1, grpc_helpers, 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 - from google.cloud.dialogflow_v2.types import conversation_profile from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from .base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport @@ -535,10 +534,10 @@ def set_suggestion_feature_config( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata] - - ``response``: - [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile] + - ``metadata``: + [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata] + - ``response``: + [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile] If a long running operation to add or update suggestion feature config for the same conversation profile, participant role and @@ -584,10 +583,10 @@ def clear_suggestion_feature_config( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata] - - ``response``: - [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile] + - ``metadata``: + [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata] + - ``response``: + [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile] Returns: Callable[[~.ClearSuggestionFeatureConfigRequest], diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc_asyncio.py index cc63a97af2d4..4abfdc190c72 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc_asyncio.py @@ -29,15 +29,14 @@ 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 -from grpc.experimental import aio # type: ignore - from google.cloud.dialogflow_v2.types import conversation_profile from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from grpc.experimental import aio # type: ignore from .base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport from .grpc import ConversationProfilesGrpcTransport @@ -544,10 +543,10 @@ def set_suggestion_feature_config( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata] - - ``response``: - [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile] + - ``metadata``: + [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata] + - ``response``: + [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile] If a long running operation to add or update suggestion feature config for the same conversation profile, participant role and @@ -593,10 +592,10 @@ def clear_suggestion_feature_config( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata] - - ``response``: - [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile] + - ``metadata``: + [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata] + - ``response``: + [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile] Returns: Callable[[~.ClearSuggestionFeatureConfigRequest], diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest.py index 3012e90ac638..64cea130be35 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest.py @@ -26,15 +26,14 @@ 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.protobuf import json_format -from requests import __version__ as requests_version - from google.cloud.dialogflow_v2.types import conversation_profile from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import json_format +from requests import __version__ as requests_version from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationProfilesRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest_base.py index ed47eef421ea..87f4c46f5f47 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest_base.py @@ -19,14 +19,13 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore 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.dialogflow_v2.types import conversation_profile from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import json_format from .base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/async_client.py index 177da090a198..ffa63851343b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -45,12 +44,16 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.conversations import pagers -from google.cloud.dialogflow_v2.types import conversation, generator, participant +from google.cloud.dialogflow_v2.types import ( + conversation, + conversation_profile, + generator, + participant, +) from google.cloud.dialogflow_v2.types import conversation as gcd_conversation +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import ConversationsClient from .transports.base import DEFAULT_CLIENT_INFO, ConversationsTransport @@ -80,12 +83,24 @@ class ConversationsAsyncClient: _DEFAULT_ENDPOINT_TEMPLATE = ConversationsClient._DEFAULT_ENDPOINT_TEMPLATE _DEFAULT_UNIVERSE = ConversationsClient._DEFAULT_UNIVERSE + app_path = staticmethod(ConversationsClient.app_path) + parse_app_path = staticmethod(ConversationsClient.parse_app_path) + ces_tool_path = staticmethod(ConversationsClient.ces_tool_path) + parse_ces_tool_path = staticmethod(ConversationsClient.parse_ces_tool_path) + toolset_path = staticmethod(ConversationsClient.toolset_path) + parse_toolset_path = staticmethod(ConversationsClient.parse_toolset_path) agent_path = staticmethod(ConversationsClient.agent_path) parse_agent_path = staticmethod(ConversationsClient.parse_agent_path) answer_record_path = staticmethod(ConversationsClient.answer_record_path) parse_answer_record_path = staticmethod( ConversationsClient.parse_answer_record_path ) + cx_security_settings_path = staticmethod( + ConversationsClient.cx_security_settings_path + ) + parse_cx_security_settings_path = staticmethod( + ConversationsClient.parse_cx_security_settings_path + ) conversation_path = staticmethod(ConversationsClient.conversation_path) parse_conversation_path = staticmethod(ConversationsClient.parse_conversation_path) conversation_model_path = staticmethod(ConversationsClient.conversation_model_path) @@ -98,14 +113,6 @@ class ConversationsAsyncClient: parse_conversation_profile_path = staticmethod( ConversationsClient.parse_conversation_profile_path ) - cx_security_settings_path = staticmethod( - ConversationsClient.cx_security_settings_path - ) - parse_cx_security_settings_path = staticmethod( - ConversationsClient.parse_cx_security_settings_path - ) - data_store_path = staticmethod(ConversationsClient.data_store_path) - parse_data_store_path = staticmethod(ConversationsClient.parse_data_store_path) document_path = staticmethod(ConversationsClient.document_path) parse_document_path = staticmethod(ConversationsClient.parse_document_path) generator_path = staticmethod(ConversationsClient.generator_path) @@ -116,19 +123,15 @@ class ConversationsAsyncClient: ) message_path = staticmethod(ConversationsClient.message_path) parse_message_path = staticmethod(ConversationsClient.parse_message_path) - phrase_set_path = staticmethod(ConversationsClient.phrase_set_path) - parse_phrase_set_path = staticmethod(ConversationsClient.parse_phrase_set_path) tool_path = staticmethod(ConversationsClient.tool_path) parse_tool_path = staticmethod(ConversationsClient.parse_tool_path) - common_billing_account_path = staticmethod( - ConversationsClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - ConversationsClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(ConversationsClient.common_folder_path) - parse_common_folder_path = staticmethod( - ConversationsClient.parse_common_folder_path + data_store_path = staticmethod(ConversationsClient.data_store_path) + parse_data_store_path = staticmethod(ConversationsClient.parse_data_store_path) + phrase_set_path = staticmethod(ConversationsClient.phrase_set_path) + parse_phrase_set_path = staticmethod(ConversationsClient.parse_phrase_set_path) + common_project_path = staticmethod(ConversationsClient.common_project_path) + parse_common_project_path = staticmethod( + ConversationsClient.parse_common_project_path ) common_organization_path = staticmethod( ConversationsClient.common_organization_path @@ -136,9 +139,15 @@ class ConversationsAsyncClient: parse_common_organization_path = staticmethod( ConversationsClient.parse_common_organization_path ) - common_project_path = staticmethod(ConversationsClient.common_project_path) - parse_common_project_path = staticmethod( - ConversationsClient.parse_common_project_path + common_folder_path = staticmethod(ConversationsClient.common_folder_path) + parse_common_folder_path = staticmethod( + ConversationsClient.parse_common_folder_path + ) + common_billing_account_path = staticmethod( + ConversationsClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + ConversationsClient.parse_common_billing_account_path ) common_location_path = staticmethod(ConversationsClient.common_location_path) parse_common_location_path = staticmethod( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/client.py index 659531046ae9..bc16c827fe02 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -62,12 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.conversations import pagers -from google.cloud.dialogflow_v2.types import conversation, generator, participant +from google.cloud.dialogflow_v2.types import ( + conversation, + conversation_profile, + generator, + participant, +) from google.cloud.dialogflow_v2.types import conversation as gcd_conversation +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, ConversationsTransport from .transports.grpc import ConversationsGrpcTransport @@ -233,6 +236,76 @@ def transport(self) -> ConversationsTransport: """ return self._transport + @staticmethod + def app_path( + project: str, + location: str, + app: str, + ) -> str: + """Returns a fully-qualified app string.""" + return "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + + @staticmethod + def parse_app_path(path: str) -> Dict[str, str]: + """Parses a app path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def ces_tool_path( + project: str, + location: str, + app: str, + tool: str, + ) -> str: + """Returns a fully-qualified ces_tool string.""" + return "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + + @staticmethod + def parse_ces_tool_path(path: str) -> Dict[str, str]: + """Parses a ces_tool path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/tools/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def toolset_path( + project: str, + location: str, + app: str, + toolset: str, + ) -> str: + """Returns a fully-qualified toolset string.""" + return "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + + @staticmethod + def parse_toolset_path(path: str) -> Dict[str, str]: + """Parses a toolset path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/toolsets/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def agent_path( project: str, @@ -267,6 +340,28 @@ def parse_answer_record_path(path: str) -> Dict[str, str]: ) return m.groupdict() if m else {} + @staticmethod + def cx_security_settings_path( + project: str, + location: str, + security_settings: str, + ) -> str: + """Returns a fully-qualified cx_security_settings string.""" + return "projects/{project}/locations/{location}/securitySettings/{security_settings}".format( + project=project, + location=location, + security_settings=security_settings, + ) + + @staticmethod + def parse_cx_security_settings_path(path: str) -> Dict[str, str]: + """Parses a cx_security_settings path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/securitySettings/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def conversation_path( project: str, @@ -328,52 +423,6 @@ def parse_conversation_profile_path(path: str) -> Dict[str, str]: ) return m.groupdict() if m else {} - @staticmethod - def cx_security_settings_path( - project: str, - location: str, - security_settings: str, - ) -> str: - """Returns a fully-qualified cx_security_settings string.""" - return "projects/{project}/locations/{location}/securitySettings/{security_settings}".format( - project=project, - location=location, - security_settings=security_settings, - ) - - @staticmethod - def parse_cx_security_settings_path(path: str) -> Dict[str, str]: - """Parses a cx_security_settings path into its component segments.""" - m = re.match( - r"^projects/(?P.+?)/locations/(?P.+?)/securitySettings/(?P.+?)$", - path, - ) - return m.groupdict() if m else {} - - @staticmethod - def data_store_path( - project: str, - location: str, - collection: str, - data_store: str, - ) -> str: - """Returns a fully-qualified data_store string.""" - return "projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store}".format( - project=project, - location=location, - collection=collection, - data_store=data_store, - ) - - @staticmethod - def parse_data_store_path(path: str) -> Dict[str, str]: - """Parses a data_store path into its component segments.""" - m = re.match( - r"^projects/(?P.+?)/locations/(?P.+?)/collections/(?P.+?)/dataStores/(?P.+?)$", - path, - ) - return m.groupdict() if m else {} - @staticmethod def document_path( project: str, @@ -462,45 +511,69 @@ def parse_message_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def phrase_set_path( + def tool_path( project: str, location: str, - phrase_set: str, + tool: str, ) -> str: - """Returns a fully-qualified phrase_set string.""" - return "projects/{project}/locations/{location}/phraseSets/{phrase_set}".format( + """Returns a fully-qualified tool string.""" + return "projects/{project}/locations/{location}/tools/{tool}".format( project=project, location=location, - phrase_set=phrase_set, + tool=tool, ) @staticmethod - def parse_phrase_set_path(path: str) -> Dict[str, str]: - """Parses a phrase_set path into its component segments.""" + def parse_tool_path(path: str) -> Dict[str, str]: + """Parses a tool path into its component segments.""" m = re.match( - r"^projects/(?P.+?)/locations/(?P.+?)/phraseSets/(?P.+?)$", + r"^projects/(?P.+?)/locations/(?P.+?)/tools/(?P.+?)$", path, ) return m.groupdict() if m else {} @staticmethod - def tool_path( + def data_store_path( project: str, location: str, - tool: str, + collection: str, + data_store: str, ) -> str: - """Returns a fully-qualified tool string.""" - return "projects/{project}/locations/{location}/tools/{tool}".format( + """Returns a fully-qualified data_store string.""" + return "projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store}".format( project=project, location=location, - tool=tool, + collection=collection, + data_store=data_store, ) @staticmethod - def parse_tool_path(path: str) -> Dict[str, str]: - """Parses a tool path into its component segments.""" + def parse_data_store_path(path: str) -> Dict[str, str]: + """Parses a data_store path into its component segments.""" m = re.match( - r"^projects/(?P.+?)/locations/(?P.+?)/tools/(?P.+?)$", + r"^projects/(?P.+?)/locations/(?P.+?)/collections/(?P.+?)/dataStores/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def phrase_set_path( + project: str, + location: str, + phrase_set: str, + ) -> str: + """Returns a fully-qualified phrase_set string.""" + return "projects/{project}/locations/{location}/phraseSets/{phrase_set}".format( + project=project, + location=location, + phrase_set=phrase_set, + ) + + @staticmethod + def parse_phrase_set_path(path: str) -> Dict[str, str]: + """Parses a phrase_set path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/phraseSets/(?P.+?)$", path, ) return m.groupdict() if m else {} diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/base.py index d63a52ff08aa..d67bf02fce00 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/base.py @@ -23,13 +23,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import conversation, participant from google.cloud.dialogflow_v2.types import conversation as gcd_conversation +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc.py index dc175f3f3cec..e3eb26648f05 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc.py @@ -26,13 +26,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2.types import conversation, participant +from google.cloud.dialogflow_v2.types import conversation as gcd_conversation from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2.types import conversation, participant -from google.cloud.dialogflow_v2.types import conversation as gcd_conversation - from .base import DEFAULT_CLIENT_INFO, ConversationsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc_asyncio.py index a64a0a50c938..1eaff8a96619 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc_asyncio.py @@ -28,14 +28,13 @@ 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.dialogflow_v2.types import conversation, participant +from google.cloud.dialogflow_v2.types import conversation as gcd_conversation from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2.types import conversation, participant -from google.cloud.dialogflow_v2.types import conversation as gcd_conversation - from .base import DEFAULT_CLIENT_INFO, ConversationsTransport from .grpc import ConversationsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest.py index 35025d4fa9b4..812e64b26a5e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest.py @@ -25,14 +25,13 @@ 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.dialogflow_v2.types import conversation, participant +from google.cloud.dialogflow_v2.types import conversation as gcd_conversation from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import conversation, participant -from google.cloud.dialogflow_v2.types import conversation as gcd_conversation - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest_base.py index d15a5c4f0246..d260ba1e2930 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest_base.py @@ -18,13 +18,12 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2.types import conversation, participant +from google.cloud.dialogflow_v2.types import conversation as gcd_conversation 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.dialogflow_v2.types import conversation, participant -from google.cloud.dialogflow_v2.types import conversation as gcd_conversation - from .base import DEFAULT_CLIENT_INFO, ConversationsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/async_client.py index 54e5cde0085c..2bd12490205c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -48,12 +47,11 @@ import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.documents import pagers from google.cloud.dialogflow_v2.types import document from google.cloud.dialogflow_v2.types import document as gcd_document +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import DocumentsClient from .transports.base import DEFAULT_CLIENT_INFO, DocumentsTransport @@ -85,20 +83,20 @@ class DocumentsAsyncClient: document_path = staticmethod(DocumentsClient.document_path) parse_document_path = staticmethod(DocumentsClient.parse_document_path) + common_project_path = staticmethod(DocumentsClient.common_project_path) + parse_common_project_path = staticmethod(DocumentsClient.parse_common_project_path) + common_organization_path = staticmethod(DocumentsClient.common_organization_path) + parse_common_organization_path = staticmethod( + DocumentsClient.parse_common_organization_path + ) + common_folder_path = staticmethod(DocumentsClient.common_folder_path) + parse_common_folder_path = staticmethod(DocumentsClient.parse_common_folder_path) common_billing_account_path = staticmethod( DocumentsClient.common_billing_account_path ) parse_common_billing_account_path = staticmethod( DocumentsClient.parse_common_billing_account_path ) - common_folder_path = staticmethod(DocumentsClient.common_folder_path) - parse_common_folder_path = staticmethod(DocumentsClient.parse_common_folder_path) - common_organization_path = staticmethod(DocumentsClient.common_organization_path) - parse_common_organization_path = staticmethod( - DocumentsClient.parse_common_organization_path - ) - common_project_path = staticmethod(DocumentsClient.common_project_path) - parse_common_project_path = staticmethod(DocumentsClient.parse_common_project_path) common_location_path = staticmethod(DocumentsClient.common_location_path) parse_common_location_path = staticmethod( DocumentsClient.parse_common_location_path @@ -560,9 +558,9 @@ async def create_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: [Document][google.cloud.dialogflow.v2.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: [Document][google.cloud.dialogflow.v2.Document] .. code-block:: python @@ -592,11 +590,11 @@ async def sample_create_document(): ) # Make the request - operation = client.create_document(request=request) + operation = await client.create_document(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -717,10 +715,10 @@ async def import_documents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: - [ImportDocumentsResponse][google.cloud.dialogflow.v2.ImportDocumentsResponse] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: + [ImportDocumentsResponse][google.cloud.dialogflow.v2.ImportDocumentsResponse] .. code-block:: python @@ -752,11 +750,11 @@ async def sample_import_documents(): ) # Make the request - operation = client.import_documents(request=request) + operation = await client.import_documents(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -837,10 +835,10 @@ async def delete_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: An `Empty + message `__ .. code-block:: python @@ -863,11 +861,11 @@ async def sample_delete_document(): ) # Make the request - operation = client.delete_document(request=request) + operation = await client.delete_document(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -981,9 +979,9 @@ async def update_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: [Document][google.cloud.dialogflow.v2.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: [Document][google.cloud.dialogflow.v2.Document] .. code-block:: python @@ -1012,11 +1010,11 @@ async def sample_update_document(): ) # Make the request - operation = client.update_document(request=request) + operation = await client.update_document(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1143,9 +1141,9 @@ async def reload_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: [Document][google.cloud.dialogflow.v2.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: [Document][google.cloud.dialogflow.v2.Document] Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. @@ -1172,11 +1170,11 @@ async def sample_reload_document(): ) # Make the request - operation = client.reload_document(request=request) + operation = await client.reload_document(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1300,9 +1298,9 @@ async def export_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: [Document][google.cloud.dialogflow.v2.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: [Document][google.cloud.dialogflow.v2.Document] .. code-block:: python @@ -1325,11 +1323,11 @@ async def sample_export_document(): ) # Make the request - operation = client.export_document(request=request) + operation = await client.export_document(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/client.py index 367d66f835e2..8dbad7c85556 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -65,12 +64,11 @@ import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.documents import pagers from google.cloud.dialogflow_v2.types import document from google.cloud.dialogflow_v2.types import document as gcd_document +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, DocumentsTransport from .transports.grpc import DocumentsGrpcTransport @@ -991,9 +989,9 @@ def create_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: [Document][google.cloud.dialogflow.v2.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: [Document][google.cloud.dialogflow.v2.Document] .. code-block:: python @@ -1145,10 +1143,10 @@ def import_documents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: - [ImportDocumentsResponse][google.cloud.dialogflow.v2.ImportDocumentsResponse] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: + [ImportDocumentsResponse][google.cloud.dialogflow.v2.ImportDocumentsResponse] .. code-block:: python @@ -1263,10 +1261,10 @@ def delete_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: An `Empty + message `__ .. code-block:: python @@ -1404,9 +1402,9 @@ def update_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: [Document][google.cloud.dialogflow.v2.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: [Document][google.cloud.dialogflow.v2.Document] .. code-block:: python @@ -1563,9 +1561,9 @@ def reload_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: [Document][google.cloud.dialogflow.v2.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: [Document][google.cloud.dialogflow.v2.Document] Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. @@ -1717,9 +1715,9 @@ def export_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: [Document][google.cloud.dialogflow.v2.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: [Document][google.cloud.dialogflow.v2.Document] .. code-block:: python diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/base.py index 63f41fed328f..f235b2765b88 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/base.py @@ -23,13 +23,12 @@ from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import document from google.cloud.dialogflow_v2.types import document as gcd_document +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc.py index 89c509336b8a..9c90eaa525f3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc.py @@ -26,13 +26,12 @@ from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2.types import document +from google.cloud.dialogflow_v2.types import document as gcd_document from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2.types import document -from google.cloud.dialogflow_v2.types import document as gcd_document - from .base import DEFAULT_CLIENT_INFO, DocumentsTransport try: @@ -412,9 +411,9 @@ def create_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: [Document][google.cloud.dialogflow.v2.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: [Document][google.cloud.dialogflow.v2.Document] Returns: Callable[[~.CreateDocumentRequest], @@ -449,10 +448,10 @@ def import_documents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: - [ImportDocumentsResponse][google.cloud.dialogflow.v2.ImportDocumentsResponse] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: + [ImportDocumentsResponse][google.cloud.dialogflow.v2.ImportDocumentsResponse] Returns: Callable[[~.ImportDocumentsRequest], @@ -485,10 +484,10 @@ def delete_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: An `Empty + message `__ Returns: Callable[[~.DeleteDocumentRequest], @@ -521,9 +520,9 @@ def update_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: [Document][google.cloud.dialogflow.v2.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: [Document][google.cloud.dialogflow.v2.Document] Returns: Callable[[~.UpdateDocumentRequest], @@ -560,9 +559,9 @@ def reload_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: [Document][google.cloud.dialogflow.v2.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: [Document][google.cloud.dialogflow.v2.Document] Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. @@ -599,9 +598,9 @@ def export_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: [Document][google.cloud.dialogflow.v2.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: [Document][google.cloud.dialogflow.v2.Document] Returns: Callable[[~.ExportDocumentRequest], diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc_asyncio.py index b2ed7a79b1b3..e60cfb2f4815 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc_asyncio.py @@ -28,14 +28,13 @@ 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.dialogflow_v2.types import document +from google.cloud.dialogflow_v2.types import document as gcd_document from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2.types import document -from google.cloud.dialogflow_v2.types import document as gcd_document - from .base import DEFAULT_CLIENT_INFO, DocumentsTransport from .grpc import DocumentsGrpcTransport @@ -424,9 +423,9 @@ def create_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: [Document][google.cloud.dialogflow.v2.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: [Document][google.cloud.dialogflow.v2.Document] Returns: Callable[[~.CreateDocumentRequest], @@ -463,10 +462,10 @@ def import_documents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: - [ImportDocumentsResponse][google.cloud.dialogflow.v2.ImportDocumentsResponse] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: + [ImportDocumentsResponse][google.cloud.dialogflow.v2.ImportDocumentsResponse] Returns: Callable[[~.ImportDocumentsRequest], @@ -501,10 +500,10 @@ def delete_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: An `Empty + message `__ Returns: Callable[[~.DeleteDocumentRequest], @@ -539,9 +538,9 @@ def update_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: [Document][google.cloud.dialogflow.v2.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: [Document][google.cloud.dialogflow.v2.Document] Returns: Callable[[~.UpdateDocumentRequest], @@ -580,9 +579,9 @@ def reload_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: [Document][google.cloud.dialogflow.v2.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: [Document][google.cloud.dialogflow.v2.Document] Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. @@ -621,9 +620,9 @@ def export_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] - - ``response``: [Document][google.cloud.dialogflow.v2.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata] + - ``response``: [Document][google.cloud.dialogflow.v2.Document] Returns: Callable[[~.ExportDocumentRequest], diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/rest.py index dd6f48e949c9..b0777c6e14aa 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/rest.py @@ -25,14 +25,13 @@ 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.dialogflow_v2.types import document +from google.cloud.dialogflow_v2.types import document as gcd_document from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import document -from google.cloud.dialogflow_v2.types import document as gcd_document - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDocumentsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/rest_base.py index b56327e3027b..e53fe6a6e9ca 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/rest_base.py @@ -18,13 +18,12 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2.types import document +from google.cloud.dialogflow_v2.types import document as gcd_document 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.dialogflow_v2.types import document -from google.cloud.dialogflow_v2.types import document as gcd_document - from .base import DEFAULT_CLIENT_INFO, DocumentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/async_client.py index 2b3a32a32f0d..9d692b088caf 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,11 +45,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.types import encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import EncryptionSpecServiceClient from .transports.base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport @@ -86,15 +84,9 @@ class EncryptionSpecServiceAsyncClient: parse_encryption_spec_path = staticmethod( EncryptionSpecServiceClient.parse_encryption_spec_path ) - common_billing_account_path = staticmethod( - EncryptionSpecServiceClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - EncryptionSpecServiceClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(EncryptionSpecServiceClient.common_folder_path) - parse_common_folder_path = staticmethod( - EncryptionSpecServiceClient.parse_common_folder_path + common_project_path = staticmethod(EncryptionSpecServiceClient.common_project_path) + parse_common_project_path = staticmethod( + EncryptionSpecServiceClient.parse_common_project_path ) common_organization_path = staticmethod( EncryptionSpecServiceClient.common_organization_path @@ -102,9 +94,15 @@ class EncryptionSpecServiceAsyncClient: parse_common_organization_path = staticmethod( EncryptionSpecServiceClient.parse_common_organization_path ) - common_project_path = staticmethod(EncryptionSpecServiceClient.common_project_path) - parse_common_project_path = staticmethod( - EncryptionSpecServiceClient.parse_common_project_path + common_folder_path = staticmethod(EncryptionSpecServiceClient.common_folder_path) + parse_common_folder_path = staticmethod( + EncryptionSpecServiceClient.parse_common_folder_path + ) + common_billing_account_path = staticmethod( + EncryptionSpecServiceClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + EncryptionSpecServiceClient.parse_common_billing_account_path ) common_location_path = staticmethod( EncryptionSpecServiceClient.common_location_path @@ -467,11 +465,11 @@ async def sample_initialize_encryption_spec(): ) # Make the request - operation = client.initialize_encryption_spec(request=request) + operation = await client.initialize_encryption_spec(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/client.py index ae9fd00a3b7f..ccd82680632c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -63,11 +62,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.types import encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport from .transports.grpc import EncryptionSpecServiceGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/base.py index 367946e1a294..df21a1bbbedc 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/base.py @@ -23,13 +23,12 @@ from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc.py index 1431bda15cd2..320a1a7c803f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc.py @@ -26,13 +26,12 @@ from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2.types import encryption_spec -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec - from .base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc_asyncio.py index d812b41a6bc9..f51e5ba8904d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc_asyncio.py @@ -28,14 +28,13 @@ 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.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2.types import encryption_spec -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec - from .base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport from .grpc import EncryptionSpecServiceGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest.py index d93fc0fd3a06..b7e7add684e1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest.py @@ -25,14 +25,13 @@ 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.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import encryption_spec -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEncryptionSpecServiceRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest_base.py index 9867fd80c600..312c74498e6d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest_base.py @@ -18,13 +18,12 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec 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.dialogflow_v2.types import encryption_spec -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec - from .base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/async_client.py index da05551cb593..d514d7106613 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -48,12 +47,11 @@ import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.entity_types import pagers from google.cloud.dialogflow_v2.types import entity_type from google.cloud.dialogflow_v2.types import entity_type as gcd_entity_type +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import EntityTypesClient from .transports.base import DEFAULT_CLIENT_INFO, EntityTypesTransport @@ -85,21 +83,21 @@ class EntityTypesAsyncClient: entity_type_path = staticmethod(EntityTypesClient.entity_type_path) parse_entity_type_path = staticmethod(EntityTypesClient.parse_entity_type_path) - common_billing_account_path = staticmethod( - EntityTypesClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - EntityTypesClient.parse_common_billing_account_path + common_project_path = staticmethod(EntityTypesClient.common_project_path) + parse_common_project_path = staticmethod( + EntityTypesClient.parse_common_project_path ) - common_folder_path = staticmethod(EntityTypesClient.common_folder_path) - parse_common_folder_path = staticmethod(EntityTypesClient.parse_common_folder_path) common_organization_path = staticmethod(EntityTypesClient.common_organization_path) parse_common_organization_path = staticmethod( EntityTypesClient.parse_common_organization_path ) - common_project_path = staticmethod(EntityTypesClient.common_project_path) - parse_common_project_path = staticmethod( - EntityTypesClient.parse_common_project_path + common_folder_path = staticmethod(EntityTypesClient.common_folder_path) + parse_common_folder_path = staticmethod(EntityTypesClient.parse_common_folder_path) + common_billing_account_path = staticmethod( + EntityTypesClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + EntityTypesClient.parse_common_billing_account_path ) common_location_path = staticmethod(EntityTypesClient.common_location_path) parse_common_location_path = staticmethod( @@ -995,10 +993,10 @@ async def batch_update_entity_types( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse] Note: You should always train an agent prior to sending it queries. See the `training @@ -1026,11 +1024,11 @@ async def sample_batch_update_entity_types(): ) # Make the request - operation = client.batch_update_entity_types(request=request) + operation = await client.batch_update_entity_types(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1114,10 +1112,10 @@ async def batch_delete_entity_types( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -1145,11 +1143,11 @@ async def sample_batch_delete_entity_types(): ) # Make the request - operation = client.batch_delete_entity_types(request=request) + operation = await client.batch_delete_entity_types(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1273,10 +1271,10 @@ async def batch_create_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -1308,11 +1306,11 @@ async def sample_batch_create_entities(): ) # Make the request - operation = client.batch_create_entities(request=request) + operation = await client.batch_create_entities(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1449,10 +1447,10 @@ async def batch_update_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -1484,11 +1482,11 @@ async def sample_batch_update_entities(): ) # Make the request - operation = client.batch_update_entities(request=request) + operation = await client.batch_update_entities(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1625,10 +1623,10 @@ async def batch_delete_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -1656,11 +1654,11 @@ async def sample_batch_delete_entities(): ) # Make the request - operation = client.batch_delete_entities(request=request) + operation = await client.batch_delete_entities(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/client.py index c59a6b4ebd11..7684dbbb870c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -65,12 +64,11 @@ import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.entity_types import pagers from google.cloud.dialogflow_v2.types import entity_type from google.cloud.dialogflow_v2.types import entity_type as gcd_entity_type +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, EntityTypesTransport from .transports.grpc import EntityTypesGrpcTransport @@ -1412,10 +1410,10 @@ def batch_update_entity_types( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse] Note: You should always train an agent prior to sending it queries. See the `training @@ -1531,10 +1529,10 @@ def batch_delete_entity_types( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -1689,10 +1687,10 @@ def batch_create_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -1862,10 +1860,10 @@ def batch_update_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -2035,10 +2033,10 @@ def batch_delete_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/base.py index 5f7f84a0f1ad..3e9c7796982a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/base.py @@ -24,13 +24,12 @@ from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import entity_type from google.cloud.dialogflow_v2.types import entity_type as gcd_entity_type +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc.py index a42bbc64d226..b539f85e28b4 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc.py @@ -27,13 +27,12 @@ from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2.types import entity_type +from google.cloud.dialogflow_v2.types import entity_type as gcd_entity_type from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2.types import entity_type -from google.cloud.dialogflow_v2.types import entity_type as gcd_entity_type - from .base import DEFAULT_CLIENT_INFO, EntityTypesTransport try: @@ -511,10 +510,10 @@ def batch_update_entity_types( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse] Note: You should always train an agent prior to sending it queries. See the `training @@ -553,10 +552,10 @@ def batch_delete_entity_types( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -593,10 +592,10 @@ def batch_create_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -635,10 +634,10 @@ def batch_update_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -675,10 +674,10 @@ def batch_delete_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc_asyncio.py index 3218ceee1b4a..f81a6cf0c9f8 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc_asyncio.py @@ -29,14 +29,13 @@ 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.dialogflow_v2.types import entity_type +from google.cloud.dialogflow_v2.types import entity_type as gcd_entity_type from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2.types import entity_type -from google.cloud.dialogflow_v2.types import entity_type as gcd_entity_type - from .base import DEFAULT_CLIENT_INFO, EntityTypesTransport from .grpc import EntityTypesGrpcTransport @@ -522,10 +521,10 @@ def batch_update_entity_types( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse] Note: You should always train an agent prior to sending it queries. See the `training @@ -564,10 +563,10 @@ def batch_delete_entity_types( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -606,10 +605,10 @@ def batch_create_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -650,10 +649,10 @@ def batch_update_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -692,10 +691,10 @@ def batch_delete_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest.py index 1ad60cee1153..1aac96b47a1f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest.py @@ -26,14 +26,13 @@ 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.dialogflow_v2.types import entity_type +from google.cloud.dialogflow_v2.types import entity_type as gcd_entity_type from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import entity_type -from google.cloud.dialogflow_v2.types import entity_type as gcd_entity_type - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEntityTypesRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest_base.py index 41a2e9dd22d6..899a64297132 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest_base.py @@ -19,13 +19,12 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2.types import entity_type +from google.cloud.dialogflow_v2.types import entity_type as gcd_entity_type 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.dialogflow_v2.types import entity_type -from google.cloud.dialogflow_v2.types import entity_type as gcd_entity_type - from .base import DEFAULT_CLIENT_INFO, EntityTypesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/async_client.py index 241913ee5af3..ffd89a8bef89 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -45,11 +44,10 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.environments import pagers from google.cloud.dialogflow_v2.types import environment, fulfillment +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import EnvironmentsClient from .transports.base import DEFAULT_CLIENT_INFO, EnvironmentsTransport @@ -85,21 +83,21 @@ class EnvironmentsAsyncClient: parse_fulfillment_path = staticmethod(EnvironmentsClient.parse_fulfillment_path) version_path = staticmethod(EnvironmentsClient.version_path) parse_version_path = staticmethod(EnvironmentsClient.parse_version_path) - common_billing_account_path = staticmethod( - EnvironmentsClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - EnvironmentsClient.parse_common_billing_account_path + common_project_path = staticmethod(EnvironmentsClient.common_project_path) + parse_common_project_path = staticmethod( + EnvironmentsClient.parse_common_project_path ) - common_folder_path = staticmethod(EnvironmentsClient.common_folder_path) - parse_common_folder_path = staticmethod(EnvironmentsClient.parse_common_folder_path) common_organization_path = staticmethod(EnvironmentsClient.common_organization_path) parse_common_organization_path = staticmethod( EnvironmentsClient.parse_common_organization_path ) - common_project_path = staticmethod(EnvironmentsClient.common_project_path) - parse_common_project_path = staticmethod( - EnvironmentsClient.parse_common_project_path + common_folder_path = staticmethod(EnvironmentsClient.common_folder_path) + parse_common_folder_path = staticmethod(EnvironmentsClient.parse_common_folder_path) + common_billing_account_path = staticmethod( + EnvironmentsClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + EnvironmentsClient.parse_common_billing_account_path ) common_location_path = staticmethod(EnvironmentsClient.common_location_path) parse_common_location_path = staticmethod( @@ -346,8 +344,8 @@ async def sample_list_environments(): Required. The agent to list all environments from. Format: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -492,10 +490,10 @@ async def sample_get_environment(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -598,10 +596,10 @@ async def sample_create_environment(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -715,10 +713,10 @@ async def sample_update_environment(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/client.py index dde07524cad1..49b3d8b658ba 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -62,11 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.environments import pagers from google.cloud.dialogflow_v2.types import environment, fulfillment +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, EnvironmentsTransport from .transports.grpc import EnvironmentsGrpcTransport @@ -808,8 +806,8 @@ def sample_list_environments(): Required. The agent to list all environments from. Format: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -951,10 +949,10 @@ def sample_get_environment(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -1055,10 +1053,10 @@ def sample_create_environment(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -1170,10 +1168,10 @@ def sample_update_environment(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/base.py index 70d4cff139ed..8a2b04177117 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/base.py @@ -24,13 +24,12 @@ 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.cloud.dialogflow_v2 import gapic_version as package_version +from google.cloud.dialogflow_v2.types import environment 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 -from google.cloud.dialogflow_v2 import gapic_version as package_version -from google.cloud.dialogflow_v2.types import environment - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ ) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc.py index f50a8eb969bb..06fbd8cc63e2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc.py @@ -27,12 +27,11 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2.types import environment from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2.types import environment - from .base import DEFAULT_CLIENT_INFO, EnvironmentsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc_asyncio.py index 3712428f9da1..24434f6d4929 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc_asyncio.py @@ -29,13 +29,12 @@ 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.dialogflow_v2.types import environment from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2.types import environment - from .base import DEFAULT_CLIENT_INFO, EnvironmentsTransport from .grpc import EnvironmentsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest.py index 063fcab3bbe5..fa6b8a8d0c55 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest.py @@ -26,13 +26,12 @@ 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.dialogflow_v2.types import environment from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import environment - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEnvironmentsRestTransport @@ -665,10 +664,10 @@ def __call__( can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the `versions and environments guide `__. @@ -941,10 +940,10 @@ def __call__( can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the `versions and environments guide `__. @@ -1404,10 +1403,10 @@ def __call__( can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the `versions and environments guide `__. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest_base.py index 2c7c6e5f6f87..4402604bc5ff 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest_base.py @@ -19,12 +19,11 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2.types import environment 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.dialogflow_v2.types import environment - from .base import DEFAULT_CLIENT_INFO, EnvironmentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/async_client.py index 9a4609d5d354..b6fb177f2fb8 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -45,11 +44,10 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.types import fulfillment from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import FulfillmentsClient from .transports.base import DEFAULT_CLIENT_INFO, FulfillmentsTransport @@ -81,21 +79,21 @@ class FulfillmentsAsyncClient: fulfillment_path = staticmethod(FulfillmentsClient.fulfillment_path) parse_fulfillment_path = staticmethod(FulfillmentsClient.parse_fulfillment_path) - common_billing_account_path = staticmethod( - FulfillmentsClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - FulfillmentsClient.parse_common_billing_account_path + common_project_path = staticmethod(FulfillmentsClient.common_project_path) + parse_common_project_path = staticmethod( + FulfillmentsClient.parse_common_project_path ) - common_folder_path = staticmethod(FulfillmentsClient.common_folder_path) - parse_common_folder_path = staticmethod(FulfillmentsClient.parse_common_folder_path) common_organization_path = staticmethod(FulfillmentsClient.common_organization_path) parse_common_organization_path = staticmethod( FulfillmentsClient.parse_common_organization_path ) - common_project_path = staticmethod(FulfillmentsClient.common_project_path) - parse_common_project_path = staticmethod( - FulfillmentsClient.parse_common_project_path + common_folder_path = staticmethod(FulfillmentsClient.common_folder_path) + parse_common_folder_path = staticmethod(FulfillmentsClient.parse_common_folder_path) + common_billing_account_path = staticmethod( + FulfillmentsClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + FulfillmentsClient.parse_common_billing_account_path ) common_location_path = staticmethod(FulfillmentsClient.common_location_path) parse_common_location_path = staticmethod( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/client.py index 0fce2d8c886c..fd5117aa2ade 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -62,11 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.types import fulfillment from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, FulfillmentsTransport from .transports.grpc import FulfillmentsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/base.py index 662b50e03eef..60bf41bdcc79 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/base.py @@ -23,13 +23,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import fulfillment from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc.py index 06e6cc97fdc2..d081242d617d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc.py @@ -26,13 +26,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2.types import fulfillment +from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2.types import fulfillment -from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment - from .base import DEFAULT_CLIENT_INFO, FulfillmentsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc_asyncio.py index bf52907e20d8..5ed2608938c3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc_asyncio.py @@ -28,14 +28,13 @@ 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.dialogflow_v2.types import fulfillment +from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2.types import fulfillment -from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment - from .base import DEFAULT_CLIENT_INFO, FulfillmentsTransport from .grpc import FulfillmentsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/rest.py index d69582eea134..cecfd17e087c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/rest.py @@ -25,14 +25,13 @@ 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.dialogflow_v2.types import fulfillment +from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import fulfillment -from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseFulfillmentsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/rest_base.py index e9e46a7fe584..c74d65cdcaef 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/rest_base.py @@ -18,13 +18,12 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2.types import fulfillment +from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment 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.dialogflow_v2.types import fulfillment -from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment - from .base import DEFAULT_CLIENT_INFO, FulfillmentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/async_client.py index d03e14c4f2e2..912211e3eeea 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -47,14 +46,13 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.generator_evaluations import pagers from google.cloud.dialogflow_v2.types import generator, generator_evaluation, operations from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import GeneratorEvaluationsClient from .transports.base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport @@ -82,6 +80,12 @@ class GeneratorEvaluationsAsyncClient: _DEFAULT_ENDPOINT_TEMPLATE = GeneratorEvaluationsClient._DEFAULT_ENDPOINT_TEMPLATE _DEFAULT_UNIVERSE = GeneratorEvaluationsClient._DEFAULT_UNIVERSE + app_path = staticmethod(GeneratorEvaluationsClient.app_path) + parse_app_path = staticmethod(GeneratorEvaluationsClient.parse_app_path) + ces_tool_path = staticmethod(GeneratorEvaluationsClient.ces_tool_path) + parse_ces_tool_path = staticmethod(GeneratorEvaluationsClient.parse_ces_tool_path) + toolset_path = staticmethod(GeneratorEvaluationsClient.toolset_path) + parse_toolset_path = staticmethod(GeneratorEvaluationsClient.parse_toolset_path) generator_path = staticmethod(GeneratorEvaluationsClient.generator_path) parse_generator_path = staticmethod(GeneratorEvaluationsClient.parse_generator_path) generator_evaluation_path = staticmethod( @@ -92,15 +96,9 @@ class GeneratorEvaluationsAsyncClient: ) tool_path = staticmethod(GeneratorEvaluationsClient.tool_path) parse_tool_path = staticmethod(GeneratorEvaluationsClient.parse_tool_path) - common_billing_account_path = staticmethod( - GeneratorEvaluationsClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - GeneratorEvaluationsClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(GeneratorEvaluationsClient.common_folder_path) - parse_common_folder_path = staticmethod( - GeneratorEvaluationsClient.parse_common_folder_path + common_project_path = staticmethod(GeneratorEvaluationsClient.common_project_path) + parse_common_project_path = staticmethod( + GeneratorEvaluationsClient.parse_common_project_path ) common_organization_path = staticmethod( GeneratorEvaluationsClient.common_organization_path @@ -108,9 +106,15 @@ class GeneratorEvaluationsAsyncClient: parse_common_organization_path = staticmethod( GeneratorEvaluationsClient.parse_common_organization_path ) - common_project_path = staticmethod(GeneratorEvaluationsClient.common_project_path) - parse_common_project_path = staticmethod( - GeneratorEvaluationsClient.parse_common_project_path + common_folder_path = staticmethod(GeneratorEvaluationsClient.common_folder_path) + parse_common_folder_path = staticmethod( + GeneratorEvaluationsClient.parse_common_folder_path + ) + common_billing_account_path = staticmethod( + GeneratorEvaluationsClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + GeneratorEvaluationsClient.parse_common_billing_account_path ) common_location_path = staticmethod(GeneratorEvaluationsClient.common_location_path) parse_common_location_path = staticmethod( @@ -359,11 +363,11 @@ async def sample_create_generator_evaluation(): ) # Make the request - operation = client.create_generator_evaluation(request=request) + operation = await client.create_generator_evaluation(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/client.py index 294919aad191..8bc04f3ba1fe 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -64,14 +63,13 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.generator_evaluations import pagers from google.cloud.dialogflow_v2.types import generator, generator_evaluation, operations from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport from .transports.grpc import GeneratorEvaluationsGrpcTransport @@ -235,6 +233,76 @@ def transport(self) -> GeneratorEvaluationsTransport: """ return self._transport + @staticmethod + def app_path( + project: str, + location: str, + app: str, + ) -> str: + """Returns a fully-qualified app string.""" + return "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + + @staticmethod + def parse_app_path(path: str) -> Dict[str, str]: + """Parses a app path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def ces_tool_path( + project: str, + location: str, + app: str, + tool: str, + ) -> str: + """Returns a fully-qualified ces_tool string.""" + return "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + + @staticmethod + def parse_ces_tool_path(path: str) -> Dict[str, str]: + """Parses a ces_tool path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/tools/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def toolset_path( + project: str, + location: str, + app: str, + toolset: str, + ) -> str: + """Returns a fully-qualified toolset string.""" + return "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + + @staticmethod + def parse_toolset_path(path: str) -> Dict[str, str]: + """Parses a toolset path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/toolsets/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def generator_path( project: str, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/base.py index 87978021a3e6..ef964d5d4dbd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/base.py @@ -24,15 +24,14 @@ from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import generator_evaluation from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc.py index bf0f72cfb736..05f7f21f756b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc.py @@ -27,14 +27,13 @@ from google.api_core import gapic_v1, grpc_helpers, 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 - from google.cloud.dialogflow_v2.types import generator_evaluation from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from .base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc_asyncio.py index ef85ad245d2b..4baaabac30af 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc_asyncio.py @@ -29,15 +29,14 @@ 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 -from grpc.experimental import aio # type: ignore - from google.cloud.dialogflow_v2.types import generator_evaluation from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from grpc.experimental import aio # type: ignore from .base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport from .grpc import GeneratorEvaluationsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest.py index 4a7e109b3214..07dffc718752 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest.py @@ -26,15 +26,14 @@ 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.protobuf import json_format -from requests import __version__ as requests_version - from google.cloud.dialogflow_v2.types import generator_evaluation from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import json_format +from requests import __version__ as requests_version from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseGeneratorEvaluationsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest_base.py index e8d975ca6d70..4d2322a32e9b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest_base.py @@ -19,14 +19,13 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore 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.dialogflow_v2.types import generator_evaluation from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import json_format from .base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/async_client.py index dd6fa36fe6d9..0aeb1ffda874 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,12 +45,11 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.generators import pagers -from google.cloud.dialogflow_v2.types import generator +from google.cloud.dialogflow_v2.types import ces_app, ces_tool, generator, toolset from google.cloud.dialogflow_v2.types import generator as gcd_generator +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import GeneratorsClient from .transports.base import DEFAULT_CLIENT_INFO, GeneratorsTransport @@ -84,24 +82,30 @@ class GeneratorsAsyncClient: _DEFAULT_ENDPOINT_TEMPLATE = GeneratorsClient._DEFAULT_ENDPOINT_TEMPLATE _DEFAULT_UNIVERSE = GeneratorsClient._DEFAULT_UNIVERSE + app_path = staticmethod(GeneratorsClient.app_path) + parse_app_path = staticmethod(GeneratorsClient.parse_app_path) + ces_tool_path = staticmethod(GeneratorsClient.ces_tool_path) + parse_ces_tool_path = staticmethod(GeneratorsClient.parse_ces_tool_path) + toolset_path = staticmethod(GeneratorsClient.toolset_path) + parse_toolset_path = staticmethod(GeneratorsClient.parse_toolset_path) generator_path = staticmethod(GeneratorsClient.generator_path) parse_generator_path = staticmethod(GeneratorsClient.parse_generator_path) tool_path = staticmethod(GeneratorsClient.tool_path) parse_tool_path = staticmethod(GeneratorsClient.parse_tool_path) + common_project_path = staticmethod(GeneratorsClient.common_project_path) + parse_common_project_path = staticmethod(GeneratorsClient.parse_common_project_path) + common_organization_path = staticmethod(GeneratorsClient.common_organization_path) + parse_common_organization_path = staticmethod( + GeneratorsClient.parse_common_organization_path + ) + common_folder_path = staticmethod(GeneratorsClient.common_folder_path) + parse_common_folder_path = staticmethod(GeneratorsClient.parse_common_folder_path) common_billing_account_path = staticmethod( GeneratorsClient.common_billing_account_path ) parse_common_billing_account_path = staticmethod( GeneratorsClient.parse_common_billing_account_path ) - common_folder_path = staticmethod(GeneratorsClient.common_folder_path) - parse_common_folder_path = staticmethod(GeneratorsClient.parse_common_folder_path) - common_organization_path = staticmethod(GeneratorsClient.common_organization_path) - parse_common_organization_path = staticmethod( - GeneratorsClient.parse_common_organization_path - ) - common_project_path = staticmethod(GeneratorsClient.common_project_path) - parse_common_project_path = staticmethod(GeneratorsClient.parse_common_project_path) common_location_path = staticmethod(GeneratorsClient.common_location_path) parse_common_location_path = staticmethod( GeneratorsClient.parse_common_location_path diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/client.py index 365855fd35c1..73861b8e34f3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -63,12 +62,11 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.generators import pagers -from google.cloud.dialogflow_v2.types import generator +from google.cloud.dialogflow_v2.types import ces_app, ces_tool, generator, toolset from google.cloud.dialogflow_v2.types import generator as gcd_generator +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, GeneratorsTransport from .transports.grpc import GeneratorsGrpcTransport @@ -237,6 +235,76 @@ def transport(self) -> GeneratorsTransport: """ return self._transport + @staticmethod + def app_path( + project: str, + location: str, + app: str, + ) -> str: + """Returns a fully-qualified app string.""" + return "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + + @staticmethod + def parse_app_path(path: str) -> Dict[str, str]: + """Parses a app path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def ces_tool_path( + project: str, + location: str, + app: str, + tool: str, + ) -> str: + """Returns a fully-qualified ces_tool string.""" + return "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + + @staticmethod + def parse_ces_tool_path(path: str) -> Dict[str, str]: + """Parses a ces_tool path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/tools/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def toolset_path( + project: str, + location: str, + app: str, + toolset: str, + ) -> str: + """Returns a fully-qualified toolset string.""" + return "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + + @staticmethod + def parse_toolset_path(path: str) -> Dict[str, str]: + """Parses a toolset path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/toolsets/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def generator_path( project: str, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/base.py index 7aa9a9159b32..61b4e0edf5ac 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/base.py @@ -24,13 +24,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import generator from google.cloud.dialogflow_v2.types import generator as gcd_generator +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc.py index c68093977573..a0e10e1eedfa 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc.py @@ -27,13 +27,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2.types import generator +from google.cloud.dialogflow_v2.types import generator as gcd_generator from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2.types import generator -from google.cloud.dialogflow_v2.types import generator as gcd_generator - from .base import DEFAULT_CLIENT_INFO, GeneratorsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc_asyncio.py index 30a0cc29d5ea..cffdabcacb70 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc_asyncio.py @@ -29,14 +29,13 @@ 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.dialogflow_v2.types import generator +from google.cloud.dialogflow_v2.types import generator as gcd_generator from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2.types import generator -from google.cloud.dialogflow_v2.types import generator as gcd_generator - from .base import DEFAULT_CLIENT_INFO, GeneratorsTransport from .grpc import GeneratorsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest.py index 5f2ebfba102c..85c0e8e7ed51 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest.py @@ -26,14 +26,13 @@ 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.dialogflow_v2.types import generator +from google.cloud.dialogflow_v2.types import generator as gcd_generator from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import generator -from google.cloud.dialogflow_v2.types import generator as gcd_generator - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseGeneratorsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest_base.py index 184c50619b72..839af31b629e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest_base.py @@ -19,13 +19,12 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2.types import generator +from google.cloud.dialogflow_v2.types import generator as gcd_generator 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.dialogflow_v2.types import generator -from google.cloud.dialogflow_v2.types import generator as gcd_generator - from .base import DEFAULT_CLIENT_INFO, GeneratorsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/async_client.py index 836dc1e69bc3..17a21ac7eb83 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -49,12 +48,11 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.intents import pagers from google.cloud.dialogflow_v2.types import context, intent from google.cloud.dialogflow_v2.types import intent as gcd_intent +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import IntentsClient from .transports.base import DEFAULT_CLIENT_INFO, IntentsTransport @@ -86,20 +84,20 @@ class IntentsAsyncClient: parse_context_path = staticmethod(IntentsClient.parse_context_path) intent_path = staticmethod(IntentsClient.intent_path) parse_intent_path = staticmethod(IntentsClient.parse_intent_path) + common_project_path = staticmethod(IntentsClient.common_project_path) + parse_common_project_path = staticmethod(IntentsClient.parse_common_project_path) + common_organization_path = staticmethod(IntentsClient.common_organization_path) + parse_common_organization_path = staticmethod( + IntentsClient.parse_common_organization_path + ) + common_folder_path = staticmethod(IntentsClient.common_folder_path) + parse_common_folder_path = staticmethod(IntentsClient.parse_common_folder_path) common_billing_account_path = staticmethod( IntentsClient.common_billing_account_path ) parse_common_billing_account_path = staticmethod( IntentsClient.parse_common_billing_account_path ) - common_folder_path = staticmethod(IntentsClient.common_folder_path) - parse_common_folder_path = staticmethod(IntentsClient.parse_common_folder_path) - common_organization_path = staticmethod(IntentsClient.common_organization_path) - parse_common_organization_path = staticmethod( - IntentsClient.parse_common_organization_path - ) - common_project_path = staticmethod(IntentsClient.common_project_path) - parse_common_project_path = staticmethod(IntentsClient.parse_common_project_path) common_location_path = staticmethod(IntentsClient.common_location_path) parse_common_location_path = staticmethod(IntentsClient.parse_common_location_path) @@ -1001,10 +999,10 @@ async def batch_update_intents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse] Note: You should always train an agent prior to sending it queries. See the `training @@ -1032,11 +1030,11 @@ async def sample_batch_update_intents(): ) # Make the request - operation = client.batch_update_intents(request=request) + operation = await client.batch_update_intents(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1163,10 +1161,10 @@ async def batch_delete_intents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -1197,11 +1195,11 @@ async def sample_batch_delete_intents(): ) # Make the request - operation = client.batch_delete_intents(request=request) + operation = await client.batch_delete_intents(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/client.py index 3050befd45d2..a2ee256ec824 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -66,12 +65,11 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.intents import pagers from google.cloud.dialogflow_v2.types import context, intent from google.cloud.dialogflow_v2.types import intent as gcd_intent +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, IntentsTransport from .transports.grpc import IntentsGrpcTransport @@ -1440,10 +1438,10 @@ def batch_update_intents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse] Note: You should always train an agent prior to sending it queries. See the `training @@ -1599,10 +1597,10 @@ def batch_delete_intents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/base.py index 82e6cdda1fb8..3afaf576298f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/base.py @@ -24,13 +24,12 @@ from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import intent from google.cloud.dialogflow_v2.types import intent as gcd_intent +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc.py index 4ea6d45dc3f1..2e93d57e7555 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc.py @@ -27,13 +27,12 @@ from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2.types import intent +from google.cloud.dialogflow_v2.types import intent as gcd_intent from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2.types import intent -from google.cloud.dialogflow_v2.types import intent as gcd_intent - from .base import DEFAULT_CLIENT_INFO, IntentsTransport try: @@ -499,10 +498,10 @@ def batch_update_intents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse] Note: You should always train an agent prior to sending it queries. See the `training @@ -539,10 +538,10 @@ def batch_delete_intents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc_asyncio.py index e5c13d937be6..64acee6a370a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc_asyncio.py @@ -29,14 +29,13 @@ 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.dialogflow_v2.types import intent +from google.cloud.dialogflow_v2.types import intent as gcd_intent from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2.types import intent -from google.cloud.dialogflow_v2.types import intent as gcd_intent - from .base import DEFAULT_CLIENT_INFO, IntentsTransport from .grpc import IntentsGrpcTransport @@ -513,10 +512,10 @@ def batch_update_intents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse] Note: You should always train an agent prior to sending it queries. See the `training @@ -555,10 +554,10 @@ def batch_delete_intents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest.py index 84a959d9a941..7a566b193378 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest.py @@ -26,14 +26,13 @@ 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.dialogflow_v2.types import intent +from google.cloud.dialogflow_v2.types import intent as gcd_intent from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import intent -from google.cloud.dialogflow_v2.types import intent as gcd_intent - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseIntentsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest_base.py index 1e9b4bfbbb1a..b83432cf1941 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest_base.py @@ -19,13 +19,12 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2.types import intent +from google.cloud.dialogflow_v2.types import intent as gcd_intent 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.dialogflow_v2.types import intent -from google.cloud.dialogflow_v2.types import intent as gcd_intent - from .base import DEFAULT_CLIENT_INFO, IntentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/async_client.py index f62ecb7a8c8b..bd82ea741daa 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -45,12 +44,11 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.knowledge_bases import pagers from google.cloud.dialogflow_v2.types import knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import KnowledgeBasesClient from .transports.base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport @@ -84,15 +82,9 @@ class KnowledgeBasesAsyncClient: parse_knowledge_base_path = staticmethod( KnowledgeBasesClient.parse_knowledge_base_path ) - common_billing_account_path = staticmethod( - KnowledgeBasesClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - KnowledgeBasesClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(KnowledgeBasesClient.common_folder_path) - parse_common_folder_path = staticmethod( - KnowledgeBasesClient.parse_common_folder_path + common_project_path = staticmethod(KnowledgeBasesClient.common_project_path) + parse_common_project_path = staticmethod( + KnowledgeBasesClient.parse_common_project_path ) common_organization_path = staticmethod( KnowledgeBasesClient.common_organization_path @@ -100,9 +92,15 @@ class KnowledgeBasesAsyncClient: parse_common_organization_path = staticmethod( KnowledgeBasesClient.parse_common_organization_path ) - common_project_path = staticmethod(KnowledgeBasesClient.common_project_path) - parse_common_project_path = staticmethod( - KnowledgeBasesClient.parse_common_project_path + common_folder_path = staticmethod(KnowledgeBasesClient.common_folder_path) + parse_common_folder_path = staticmethod( + KnowledgeBasesClient.parse_common_folder_path + ) + common_billing_account_path = staticmethod( + KnowledgeBasesClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + KnowledgeBasesClient.parse_common_billing_account_path ) common_location_path = staticmethod(KnowledgeBasesClient.common_location_path) parse_common_location_path = staticmethod( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/client.py index 1e1bab9e5e07..f9c6923da4c1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -62,12 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.knowledge_bases import pagers from google.cloud.dialogflow_v2.types import knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport from .transports.grpc import KnowledgeBasesGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/base.py index c477709df193..0ee3cbd1c0f9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/base.py @@ -24,13 +24,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc.py index 3542aa30f911..778c8500289b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc.py @@ -27,13 +27,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2.types import knowledge_base -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base - from .base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc_asyncio.py index d08030f0f71c..cea8d76d7edf 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc_asyncio.py @@ -29,14 +29,13 @@ 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.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2.types import knowledge_base -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base - from .base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport from .grpc import KnowledgeBasesGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest.py index 75a1f540323d..2cd21a8449de 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest.py @@ -26,14 +26,13 @@ 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.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import knowledge_base -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseKnowledgeBasesRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest_base.py index fac709d3acf4..d80d1a2f1ad5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest_base.py @@ -19,13 +19,12 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base 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.dialogflow_v2.types import knowledge_base -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base - from .base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/async_client.py index 508ada1daf04..4671d06005a2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/async_client.py @@ -38,9 +38,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -48,12 +47,11 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.participants import pagers from google.cloud.dialogflow_v2.types import participant, session from google.cloud.dialogflow_v2.types import participant as gcd_participant +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import ParticipantsClient from .transports.base import DEFAULT_CLIENT_INFO, ParticipantsTransport @@ -83,6 +81,12 @@ class ParticipantsAsyncClient: _DEFAULT_ENDPOINT_TEMPLATE = ParticipantsClient._DEFAULT_ENDPOINT_TEMPLATE _DEFAULT_UNIVERSE = ParticipantsClient._DEFAULT_UNIVERSE + app_path = staticmethod(ParticipantsClient.app_path) + parse_app_path = staticmethod(ParticipantsClient.parse_app_path) + ces_tool_path = staticmethod(ParticipantsClient.ces_tool_path) + parse_ces_tool_path = staticmethod(ParticipantsClient.parse_ces_tool_path) + toolset_path = staticmethod(ParticipantsClient.toolset_path) + parse_toolset_path = staticmethod(ParticipantsClient.parse_toolset_path) answer_record_path = staticmethod(ParticipantsClient.answer_record_path) parse_answer_record_path = staticmethod(ParticipantsClient.parse_answer_record_path) context_path = staticmethod(ParticipantsClient.context_path) @@ -93,29 +97,29 @@ class ParticipantsAsyncClient: parse_message_path = staticmethod(ParticipantsClient.parse_message_path) participant_path = staticmethod(ParticipantsClient.participant_path) parse_participant_path = staticmethod(ParticipantsClient.parse_participant_path) - phrase_set_path = staticmethod(ParticipantsClient.phrase_set_path) - parse_phrase_set_path = staticmethod(ParticipantsClient.parse_phrase_set_path) session_entity_type_path = staticmethod(ParticipantsClient.session_entity_type_path) parse_session_entity_type_path = staticmethod( ParticipantsClient.parse_session_entity_type_path ) tool_path = staticmethod(ParticipantsClient.tool_path) parse_tool_path = staticmethod(ParticipantsClient.parse_tool_path) - common_billing_account_path = staticmethod( - ParticipantsClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - ParticipantsClient.parse_common_billing_account_path + phrase_set_path = staticmethod(ParticipantsClient.phrase_set_path) + parse_phrase_set_path = staticmethod(ParticipantsClient.parse_phrase_set_path) + common_project_path = staticmethod(ParticipantsClient.common_project_path) + parse_common_project_path = staticmethod( + ParticipantsClient.parse_common_project_path ) - common_folder_path = staticmethod(ParticipantsClient.common_folder_path) - parse_common_folder_path = staticmethod(ParticipantsClient.parse_common_folder_path) common_organization_path = staticmethod(ParticipantsClient.common_organization_path) parse_common_organization_path = staticmethod( ParticipantsClient.parse_common_organization_path ) - common_project_path = staticmethod(ParticipantsClient.common_project_path) - parse_common_project_path = staticmethod( - ParticipantsClient.parse_common_project_path + common_folder_path = staticmethod(ParticipantsClient.common_folder_path) + parse_common_folder_path = staticmethod(ParticipantsClient.parse_common_folder_path) + common_billing_account_path = staticmethod( + ParticipantsClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + ParticipantsClient.parse_common_billing_account_path ) common_location_path = staticmethod(ParticipantsClient.common_location_path) parse_common_location_path = staticmethod( @@ -1045,9 +1049,9 @@ def request_generator(): to continue with Speech recognition. However, note that: - - Dialogflow will bill you for the audio so far. - - Dialogflow discards all Speech recognition results - in favor of the text input. + - Dialogflow will bill you for the audio so far. + - Dialogflow discards all Speech recognition results + in favor of the text input. 3. If [StreamingAnalyzeContentRequest.config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/client.py index 46a274dbd63a..807efcd8ac9b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/client.py @@ -45,9 +45,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -64,12 +63,11 @@ _LOGGER = std_logging.getLogger(__name__) import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.participants import pagers from google.cloud.dialogflow_v2.types import participant, session from google.cloud.dialogflow_v2.types import participant as gcd_participant +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, ParticipantsTransport from .transports.grpc import ParticipantsGrpcTransport @@ -235,6 +233,76 @@ def transport(self) -> ParticipantsTransport: """ return self._transport + @staticmethod + def app_path( + project: str, + location: str, + app: str, + ) -> str: + """Returns a fully-qualified app string.""" + return "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + + @staticmethod + def parse_app_path(path: str) -> Dict[str, str]: + """Parses a app path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def ces_tool_path( + project: str, + location: str, + app: str, + tool: str, + ) -> str: + """Returns a fully-qualified ces_tool string.""" + return "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + + @staticmethod + def parse_ces_tool_path(path: str) -> Dict[str, str]: + """Parses a ces_tool path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/tools/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def toolset_path( + project: str, + location: str, + app: str, + toolset: str, + ) -> str: + """Returns a fully-qualified toolset string.""" + return "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + + @staticmethod + def parse_toolset_path(path: str) -> Dict[str, str]: + """Parses a toolset path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/toolsets/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def answer_record_path( project: str, @@ -339,28 +407,6 @@ def parse_participant_path(path: str) -> Dict[str, str]: ) return m.groupdict() if m else {} - @staticmethod - def phrase_set_path( - project: str, - location: str, - phrase_set: str, - ) -> str: - """Returns a fully-qualified phrase_set string.""" - return "projects/{project}/locations/{location}/phraseSets/{phrase_set}".format( - project=project, - location=location, - phrase_set=phrase_set, - ) - - @staticmethod - def parse_phrase_set_path(path: str) -> Dict[str, str]: - """Parses a phrase_set path into its component segments.""" - m = re.match( - r"^projects/(?P.+?)/locations/(?P.+?)/phraseSets/(?P.+?)$", - path, - ) - return m.groupdict() if m else {} - @staticmethod def session_entity_type_path( project: str, @@ -405,6 +451,28 @@ def parse_tool_path(path: str) -> Dict[str, str]: ) return m.groupdict() if m else {} + @staticmethod + def phrase_set_path( + project: str, + location: str, + phrase_set: str, + ) -> str: + """Returns a fully-qualified phrase_set string.""" + return "projects/{project}/locations/{location}/phraseSets/{phrase_set}".format( + project=project, + location=location, + phrase_set=phrase_set, + ) + + @staticmethod + def parse_phrase_set_path(path: str) -> Dict[str, str]: + """Parses a phrase_set path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/phraseSets/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def common_billing_account_path( billing_account: str, @@ -1594,9 +1662,9 @@ def request_generator(): to continue with Speech recognition. However, note that: - - Dialogflow will bill you for the audio so far. - - Dialogflow discards all Speech recognition results - in favor of the text input. + - Dialogflow will bill you for the audio so far. + - Dialogflow discards all Speech recognition results + in favor of the text input. 3. If [StreamingAnalyzeContentRequest.config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/base.py index 3d619730aef5..e85abfbc0f2a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/base.py @@ -23,13 +23,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import participant from google.cloud.dialogflow_v2.types import participant as gcd_participant +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc.py index eeca047836fd..fc0fa9da23f9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc.py @@ -26,13 +26,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2.types import participant +from google.cloud.dialogflow_v2.types import participant as gcd_participant from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2.types import participant -from google.cloud.dialogflow_v2.types import participant as gcd_participant - from .base import DEFAULT_CLIENT_INFO, ParticipantsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc_asyncio.py index 5eac06ad1fdf..b6d202608f5c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc_asyncio.py @@ -28,14 +28,13 @@ 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.dialogflow_v2.types import participant +from google.cloud.dialogflow_v2.types import participant as gcd_participant from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2.types import participant -from google.cloud.dialogflow_v2.types import participant as gcd_participant - from .base import DEFAULT_CLIENT_INFO, ParticipantsTransport from .grpc import ParticipantsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/rest.py index b8aba87109cd..3ca7f3121228 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/rest.py @@ -25,14 +25,13 @@ 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.dialogflow_v2.types import participant +from google.cloud.dialogflow_v2.types import participant as gcd_participant from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import participant -from google.cloud.dialogflow_v2.types import participant as gcd_participant - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseParticipantsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/rest_base.py index a3ad03fef3de..721ac60b0d3c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/rest_base.py @@ -18,13 +18,12 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2.types import participant +from google.cloud.dialogflow_v2.types import participant as gcd_participant 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.dialogflow_v2.types import participant -from google.cloud.dialogflow_v2.types import participant as gcd_participant - from .base import DEFAULT_CLIENT_INFO, ParticipantsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/async_client.py index e2a35e3f090f..01025786f9bb 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -45,14 +44,13 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.session_entity_types import pagers from google.cloud.dialogflow_v2.types import entity_type, session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import SessionEntityTypesClient from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport @@ -88,15 +86,9 @@ class SessionEntityTypesAsyncClient: parse_session_entity_type_path = staticmethod( SessionEntityTypesClient.parse_session_entity_type_path ) - common_billing_account_path = staticmethod( - SessionEntityTypesClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - SessionEntityTypesClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(SessionEntityTypesClient.common_folder_path) - parse_common_folder_path = staticmethod( - SessionEntityTypesClient.parse_common_folder_path + common_project_path = staticmethod(SessionEntityTypesClient.common_project_path) + parse_common_project_path = staticmethod( + SessionEntityTypesClient.parse_common_project_path ) common_organization_path = staticmethod( SessionEntityTypesClient.common_organization_path @@ -104,9 +96,15 @@ class SessionEntityTypesAsyncClient: parse_common_organization_path = staticmethod( SessionEntityTypesClient.parse_common_organization_path ) - common_project_path = staticmethod(SessionEntityTypesClient.common_project_path) - parse_common_project_path = staticmethod( - SessionEntityTypesClient.parse_common_project_path + common_folder_path = staticmethod(SessionEntityTypesClient.common_folder_path) + parse_common_folder_path = staticmethod( + SessionEntityTypesClient.parse_common_folder_path + ) + common_billing_account_path = staticmethod( + SessionEntityTypesClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + SessionEntityTypesClient.parse_common_billing_account_path ) common_location_path = staticmethod(SessionEntityTypesClient.common_location_path) parse_common_location_path = staticmethod( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/client.py index 38a707e2b521..46a94ed5213f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -62,14 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.session_entity_types import pagers from google.cloud.dialogflow_v2.types import entity_type, session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .transports.grpc import SessionEntityTypesGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/base.py index 03dde8d7446e..0c237e80bea0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/base.py @@ -24,15 +24,14 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc.py index 756419d03523..41b6d43a62e4 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc.py @@ -27,14 +27,13 @@ from google.api_core import gapic_v1, grpc_helpers 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 - from google.cloud.dialogflow_v2.types import session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc_asyncio.py index bb3de5c4cd71..766500171ad3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc_asyncio.py @@ -29,15 +29,14 @@ 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 -from grpc.experimental import aio # type: ignore - from google.cloud.dialogflow_v2.types import session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from grpc.experimental import aio # type: ignore from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .grpc import SessionEntityTypesGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest.py index 5ee223e35e51..838f54ff2056 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest.py @@ -26,15 +26,14 @@ 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.protobuf import json_format -from requests import __version__ as requests_version - from google.cloud.dialogflow_v2.types import session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import json_format +from requests import __version__ as requests_version from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSessionEntityTypesRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest_base.py index 9eb4a07a0ea2..137c94166102 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest_base.py @@ -19,14 +19,13 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore 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.dialogflow_v2.types import session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import json_format from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/async_client.py index b3e45a67387f..a9f47cca2830 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/async_client.py @@ -38,9 +38,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -48,11 +47,10 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.types import audio_config, session from google.cloud.dialogflow_v2.types import session as gcd_session +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import SessionsClient from .transports.base import DEFAULT_CLIENT_INFO, SessionsTransport @@ -88,28 +86,28 @@ class SessionsAsyncClient: parse_context_path = staticmethod(SessionsClient.parse_context_path) intent_path = staticmethod(SessionsClient.intent_path) parse_intent_path = staticmethod(SessionsClient.parse_intent_path) - phrase_set_path = staticmethod(SessionsClient.phrase_set_path) - parse_phrase_set_path = staticmethod(SessionsClient.parse_phrase_set_path) session_path = staticmethod(SessionsClient.session_path) parse_session_path = staticmethod(SessionsClient.parse_session_path) session_entity_type_path = staticmethod(SessionsClient.session_entity_type_path) parse_session_entity_type_path = staticmethod( SessionsClient.parse_session_entity_type_path ) + phrase_set_path = staticmethod(SessionsClient.phrase_set_path) + parse_phrase_set_path = staticmethod(SessionsClient.parse_phrase_set_path) + common_project_path = staticmethod(SessionsClient.common_project_path) + parse_common_project_path = staticmethod(SessionsClient.parse_common_project_path) + common_organization_path = staticmethod(SessionsClient.common_organization_path) + parse_common_organization_path = staticmethod( + SessionsClient.parse_common_organization_path + ) + common_folder_path = staticmethod(SessionsClient.common_folder_path) + parse_common_folder_path = staticmethod(SessionsClient.parse_common_folder_path) common_billing_account_path = staticmethod( SessionsClient.common_billing_account_path ) parse_common_billing_account_path = staticmethod( SessionsClient.parse_common_billing_account_path ) - common_folder_path = staticmethod(SessionsClient.common_folder_path) - parse_common_folder_path = staticmethod(SessionsClient.parse_common_folder_path) - common_organization_path = staticmethod(SessionsClient.common_organization_path) - parse_common_organization_path = staticmethod( - SessionsClient.parse_common_organization_path - ) - common_project_path = staticmethod(SessionsClient.common_project_path) - parse_common_project_path = staticmethod(SessionsClient.parse_common_project_path) common_location_path = staticmethod(SessionsClient.common_location_path) parse_common_location_path = staticmethod(SessionsClient.parse_common_location_path) @@ -573,12 +571,12 @@ def request_generator(): However, note that: - - Dialogflow will bill you for the audio duration so - far. - - Dialogflow discards all Speech recognition results - in favor of the input text. - - Dialogflow will use the language code from the - first message. + - Dialogflow will bill you for the audio duration so + far. + - Dialogflow discards all Speech recognition results + in favor of the input text. + - Dialogflow will use the language code from the + first message. After you sent all input, you must half-close or abort the request stream. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/client.py index 3798dcec913a..c4e1c97979ad 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/client.py @@ -45,9 +45,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -64,11 +63,10 @@ _LOGGER = std_logging.getLogger(__name__) import google.rpc.status_pb2 as status_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.types import audio_config, session from google.cloud.dialogflow_v2.types import session as gcd_session +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, SessionsTransport from .transports.grpc import SessionsGrpcTransport @@ -275,28 +273,6 @@ def parse_intent_path(path: str) -> Dict[str, str]: m = re.match(r"^projects/(?P.+?)/agent/intents/(?P.+?)$", path) return m.groupdict() if m else {} - @staticmethod - def phrase_set_path( - project: str, - location: str, - phrase_set: str, - ) -> str: - """Returns a fully-qualified phrase_set string.""" - return "projects/{project}/locations/{location}/phraseSets/{phrase_set}".format( - project=project, - location=location, - phrase_set=phrase_set, - ) - - @staticmethod - def parse_phrase_set_path(path: str) -> Dict[str, str]: - """Parses a phrase_set path into its component segments.""" - m = re.match( - r"^projects/(?P.+?)/locations/(?P.+?)/phraseSets/(?P.+?)$", - path, - ) - return m.groupdict() if m else {} - @staticmethod def session_path( project: str, @@ -338,6 +314,28 @@ def parse_session_entity_type_path(path: str) -> Dict[str, str]: ) return m.groupdict() if m else {} + @staticmethod + def phrase_set_path( + project: str, + location: str, + phrase_set: str, + ) -> str: + """Returns a fully-qualified phrase_set string.""" + return "projects/{project}/locations/{location}/phraseSets/{phrase_set}".format( + project=project, + location=location, + phrase_set=phrase_set, + ) + + @staticmethod + def parse_phrase_set_path(path: str) -> Dict[str, str]: + """Parses a phrase_set path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/phraseSets/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def common_billing_account_path( billing_account: str, @@ -1078,12 +1076,12 @@ def request_generator(): However, note that: - - Dialogflow will bill you for the audio duration so - far. - - Dialogflow discards all Speech recognition results - in favor of the input text. - - Dialogflow will use the language code from the - first message. + - Dialogflow will bill you for the audio duration so + far. + - Dialogflow discards all Speech recognition results + in favor of the input text. + - Dialogflow will use the language code from the + first message. After you sent all input, you must half-close or abort the request stream. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/base.py index e1015022ec0c..a00e102648a8 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/base.py @@ -23,13 +23,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import session from google.cloud.dialogflow_v2.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.oauth2 import service_account # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc.py index 8647daf1190f..40c0ca291084 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc.py @@ -26,13 +26,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2.types import session +from google.cloud.dialogflow_v2.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.json_format import MessageToJson -from google.cloud.dialogflow_v2.types import session -from google.cloud.dialogflow_v2.types import session as gcd_session - from .base import DEFAULT_CLIENT_INFO, SessionsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc_asyncio.py index c4c0cd9ae1c4..d62ffda7b8bb 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc_asyncio.py @@ -28,14 +28,13 @@ 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.dialogflow_v2.types import session +from google.cloud.dialogflow_v2.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.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2.types import session -from google.cloud.dialogflow_v2.types import session as gcd_session - from .base import DEFAULT_CLIENT_INFO, SessionsTransport from .grpc import SessionsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/rest.py index 1d25e597ea95..f78b2f8726e2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/rest.py @@ -25,14 +25,13 @@ 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.dialogflow_v2.types import session +from google.cloud.dialogflow_v2.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 json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import session -from google.cloud.dialogflow_v2.types import session as gcd_session - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSessionsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/rest_base.py index 46ad480692d4..0be17f67e22e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/rest_base.py @@ -18,13 +18,12 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2.types import session +from google.cloud.dialogflow_v2.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 json_format -from google.cloud.dialogflow_v2.types import session -from google.cloud.dialogflow_v2.types import session as gcd_session - from .base import DEFAULT_CLIENT_INFO, SessionsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/async_client.py index a957c1e4eb86..6260cadeeea1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -45,12 +44,11 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.sip_trunks import pagers from google.cloud.dialogflow_v2.types import sip_trunk from google.cloud.dialogflow_v2.types import sip_trunk as gcd_sip_trunk +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import SipTrunksClient from .transports.base import DEFAULT_CLIENT_INFO, SipTrunksTransport @@ -82,20 +80,20 @@ class SipTrunksAsyncClient: sip_trunk_path = staticmethod(SipTrunksClient.sip_trunk_path) parse_sip_trunk_path = staticmethod(SipTrunksClient.parse_sip_trunk_path) + common_project_path = staticmethod(SipTrunksClient.common_project_path) + parse_common_project_path = staticmethod(SipTrunksClient.parse_common_project_path) + common_organization_path = staticmethod(SipTrunksClient.common_organization_path) + parse_common_organization_path = staticmethod( + SipTrunksClient.parse_common_organization_path + ) + common_folder_path = staticmethod(SipTrunksClient.common_folder_path) + parse_common_folder_path = staticmethod(SipTrunksClient.parse_common_folder_path) common_billing_account_path = staticmethod( SipTrunksClient.common_billing_account_path ) parse_common_billing_account_path = staticmethod( SipTrunksClient.parse_common_billing_account_path ) - common_folder_path = staticmethod(SipTrunksClient.common_folder_path) - parse_common_folder_path = staticmethod(SipTrunksClient.parse_common_folder_path) - common_organization_path = staticmethod(SipTrunksClient.common_organization_path) - parse_common_organization_path = staticmethod( - SipTrunksClient.parse_common_organization_path - ) - common_project_path = staticmethod(SipTrunksClient.common_project_path) - parse_common_project_path = staticmethod(SipTrunksClient.parse_common_project_path) common_location_path = staticmethod(SipTrunksClient.common_location_path) parse_common_location_path = staticmethod( SipTrunksClient.parse_common_location_path diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/client.py index 624e719e2035..22f151822be1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -62,12 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.sip_trunks import pagers from google.cloud.dialogflow_v2.types import sip_trunk from google.cloud.dialogflow_v2.types import sip_trunk as gcd_sip_trunk +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, SipTrunksTransport from .transports.grpc import SipTrunksGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/base.py index d45c68f4bcdf..e526590e5cf3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/base.py @@ -24,13 +24,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import sip_trunk from google.cloud.dialogflow_v2.types import sip_trunk as gcd_sip_trunk +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc.py index b98ca1609b2e..504427aa8d9c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc.py @@ -27,13 +27,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2.types import sip_trunk +from google.cloud.dialogflow_v2.types import sip_trunk as gcd_sip_trunk from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2.types import sip_trunk -from google.cloud.dialogflow_v2.types import sip_trunk as gcd_sip_trunk - from .base import DEFAULT_CLIENT_INFO, SipTrunksTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc_asyncio.py index c36304bafc70..db5ccf078e75 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc_asyncio.py @@ -29,14 +29,13 @@ 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.dialogflow_v2.types import sip_trunk +from google.cloud.dialogflow_v2.types import sip_trunk as gcd_sip_trunk from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2.types import sip_trunk -from google.cloud.dialogflow_v2.types import sip_trunk as gcd_sip_trunk - from .base import DEFAULT_CLIENT_INFO, SipTrunksTransport from .grpc import SipTrunksGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest.py index 4940841d8a94..6c691541a5fc 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest.py @@ -26,14 +26,13 @@ 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.dialogflow_v2.types import sip_trunk +from google.cloud.dialogflow_v2.types import sip_trunk as gcd_sip_trunk from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import sip_trunk -from google.cloud.dialogflow_v2.types import sip_trunk as gcd_sip_trunk - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSipTrunksRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest_base.py index a8a5b23558a0..3e6111b0184c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest_base.py @@ -19,13 +19,12 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2.types import sip_trunk +from google.cloud.dialogflow_v2.types import sip_trunk as gcd_sip_trunk 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.dialogflow_v2.types import sip_trunk -from google.cloud.dialogflow_v2.types import sip_trunk as gcd_sip_trunk - from .base import DEFAULT_CLIENT_INFO, SipTrunksTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/async_client.py index 7acc42429ac7..2879a987ea5c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,12 +45,11 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.tools import pagers from google.cloud.dialogflow_v2.types import tool from google.cloud.dialogflow_v2.types import tool as gcd_tool +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import ToolsClient from .transports.base import DEFAULT_CLIENT_INFO, ToolsTransport @@ -82,24 +80,24 @@ class ToolsAsyncClient: _DEFAULT_ENDPOINT_TEMPLATE = ToolsClient._DEFAULT_ENDPOINT_TEMPLATE _DEFAULT_UNIVERSE = ToolsClient._DEFAULT_UNIVERSE + tool_path = staticmethod(ToolsClient.tool_path) + parse_tool_path = staticmethod(ToolsClient.parse_tool_path) secret_version_path = staticmethod(ToolsClient.secret_version_path) parse_secret_version_path = staticmethod(ToolsClient.parse_secret_version_path) service_path = staticmethod(ToolsClient.service_path) parse_service_path = staticmethod(ToolsClient.parse_service_path) - tool_path = staticmethod(ToolsClient.tool_path) - parse_tool_path = staticmethod(ToolsClient.parse_tool_path) - common_billing_account_path = staticmethod(ToolsClient.common_billing_account_path) - parse_common_billing_account_path = staticmethod( - ToolsClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(ToolsClient.common_folder_path) - parse_common_folder_path = staticmethod(ToolsClient.parse_common_folder_path) + common_project_path = staticmethod(ToolsClient.common_project_path) + parse_common_project_path = staticmethod(ToolsClient.parse_common_project_path) common_organization_path = staticmethod(ToolsClient.common_organization_path) parse_common_organization_path = staticmethod( ToolsClient.parse_common_organization_path ) - common_project_path = staticmethod(ToolsClient.common_project_path) - parse_common_project_path = staticmethod(ToolsClient.parse_common_project_path) + common_folder_path = staticmethod(ToolsClient.common_folder_path) + parse_common_folder_path = staticmethod(ToolsClient.parse_common_folder_path) + common_billing_account_path = staticmethod(ToolsClient.common_billing_account_path) + parse_common_billing_account_path = staticmethod( + ToolsClient.parse_common_billing_account_path + ) common_location_path = staticmethod(ToolsClient.common_location_path) parse_common_location_path = staticmethod(ToolsClient.parse_common_location_path) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/client.py index 9d63686eadea..317647bfab33 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -63,12 +62,11 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.tools import pagers from google.cloud.dialogflow_v2.types import tool from google.cloud.dialogflow_v2.types import tool as gcd_tool +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, ToolsTransport from .transports.grpc import ToolsGrpcTransport @@ -235,6 +233,28 @@ def transport(self) -> ToolsTransport: """ return self._transport + @staticmethod + def tool_path( + project: str, + location: str, + tool: str, + ) -> str: + """Returns a fully-qualified tool string.""" + return "projects/{project}/locations/{location}/tools/{tool}".format( + project=project, + location=location, + tool=tool, + ) + + @staticmethod + def parse_tool_path(path: str) -> Dict[str, str]: + """Parses a tool path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/tools/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def secret_version_path( project: str, @@ -281,28 +301,6 @@ def parse_service_path(path: str) -> Dict[str, str]: ) return m.groupdict() if m else {} - @staticmethod - def tool_path( - project: str, - location: str, - tool: str, - ) -> str: - """Returns a fully-qualified tool string.""" - return "projects/{project}/locations/{location}/tools/{tool}".format( - project=project, - location=location, - tool=tool, - ) - - @staticmethod - def parse_tool_path(path: str) -> Dict[str, str]: - """Parses a tool path into its component segments.""" - m = re.match( - r"^projects/(?P.+?)/locations/(?P.+?)/tools/(?P.+?)$", - path, - ) - return m.groupdict() if m else {} - @staticmethod def common_billing_account_path( billing_account: str, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/base.py index 4897eabc1469..1e1c08917850 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/base.py @@ -24,13 +24,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import tool from google.cloud.dialogflow_v2.types import tool as gcd_tool +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc.py index b51166d87033..4327df6c635b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc.py @@ -27,13 +27,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2.types import tool +from google.cloud.dialogflow_v2.types import tool as gcd_tool from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2.types import tool -from google.cloud.dialogflow_v2.types import tool as gcd_tool - from .base import DEFAULT_CLIENT_INFO, ToolsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc_asyncio.py index 48330ce946e9..b26c70ff7b45 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc_asyncio.py @@ -29,14 +29,13 @@ 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.dialogflow_v2.types import tool +from google.cloud.dialogflow_v2.types import tool as gcd_tool from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2.types import tool -from google.cloud.dialogflow_v2.types import tool as gcd_tool - from .base import DEFAULT_CLIENT_INFO, ToolsTransport from .grpc import ToolsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest.py index 4f7222bb0150..b42490742f7a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest.py @@ -26,14 +26,13 @@ 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.dialogflow_v2.types import tool +from google.cloud.dialogflow_v2.types import tool as gcd_tool from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import tool -from google.cloud.dialogflow_v2.types import tool as gcd_tool - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseToolsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest_base.py index 340601af1a40..a8d6400d7d19 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest_base.py @@ -19,13 +19,12 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2.types import tool +from google.cloud.dialogflow_v2.types import tool as gcd_tool 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.dialogflow_v2.types import tool -from google.cloud.dialogflow_v2.types import tool as gcd_tool - from .base import DEFAULT_CLIENT_INFO, ToolsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/async_client.py index 08021bf90a7d..0920e8f597aa 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,12 +45,11 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.versions import pagers from google.cloud.dialogflow_v2.types import version from google.cloud.dialogflow_v2.types import version as gcd_version +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import VersionsClient from .transports.base import DEFAULT_CLIENT_INFO, VersionsTransport @@ -81,20 +79,20 @@ class VersionsAsyncClient: version_path = staticmethod(VersionsClient.version_path) parse_version_path = staticmethod(VersionsClient.parse_version_path) + common_project_path = staticmethod(VersionsClient.common_project_path) + parse_common_project_path = staticmethod(VersionsClient.parse_common_project_path) + common_organization_path = staticmethod(VersionsClient.common_organization_path) + parse_common_organization_path = staticmethod( + VersionsClient.parse_common_organization_path + ) + common_folder_path = staticmethod(VersionsClient.common_folder_path) + parse_common_folder_path = staticmethod(VersionsClient.parse_common_folder_path) common_billing_account_path = staticmethod( VersionsClient.common_billing_account_path ) parse_common_billing_account_path = staticmethod( VersionsClient.parse_common_billing_account_path ) - common_folder_path = staticmethod(VersionsClient.common_folder_path) - parse_common_folder_path = staticmethod(VersionsClient.parse_common_folder_path) - common_organization_path = staticmethod(VersionsClient.common_organization_path) - parse_common_organization_path = staticmethod( - VersionsClient.parse_common_organization_path - ) - common_project_path = staticmethod(VersionsClient.common_project_path) - parse_common_project_path = staticmethod(VersionsClient.parse_common_project_path) common_location_path = staticmethod(VersionsClient.common_location_path) parse_common_location_path = staticmethod(VersionsClient.parse_common_location_path) @@ -338,8 +336,8 @@ async def sample_list_versions(): Required. The agent to list all versions from. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -465,8 +463,8 @@ async def sample_get_version(): name (:class:`str`): Required. The name of the version. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` This corresponds to the ``name`` field on the ``request`` instance; if ``request`` is provided, this @@ -494,10 +492,10 @@ async def sample_get_version(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -602,8 +600,8 @@ async def sample_create_version(): Required. The agent to create a version for. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -636,10 +634,10 @@ async def sample_create_version(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -746,8 +744,8 @@ async def sample_update_version(): version (:class:`google.cloud.dialogflow_v2.types.Version`): Required. The version to update. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` This corresponds to the ``version`` field on the ``request`` instance; if ``request`` is provided, this @@ -782,10 +780,10 @@ async def sample_update_version(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -887,8 +885,8 @@ async def sample_delete_version(): Required. The name of the version to delete. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` This corresponds to the ``name`` field on the ``request`` instance; if ``request`` is provided, this diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/client.py index 782db54e0654..e3b545c05673 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -63,12 +62,11 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2.services.versions import pagers from google.cloud.dialogflow_v2.types import version from google.cloud.dialogflow_v2.types import version as gcd_version +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, VersionsTransport from .transports.grpc import VersionsGrpcTransport @@ -774,8 +772,8 @@ def sample_list_versions(): Required. The agent to list all versions from. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -898,8 +896,8 @@ def sample_get_version(): name (str): Required. The name of the version. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` This corresponds to the ``name`` field on the ``request`` instance; if ``request`` is provided, this @@ -927,10 +925,10 @@ def sample_get_version(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -1032,8 +1030,8 @@ def sample_create_version(): Required. The agent to create a version for. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -1066,10 +1064,10 @@ def sample_create_version(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -1173,8 +1171,8 @@ def sample_update_version(): version (google.cloud.dialogflow_v2.types.Version): Required. The version to update. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` This corresponds to the ``version`` field on the ``request`` instance; if ``request`` is provided, this @@ -1209,10 +1207,10 @@ def sample_update_version(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -1311,8 +1309,8 @@ def sample_delete_version(): Required. The name of the version to delete. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` This corresponds to the ``name`` field on the ``request`` instance; if ``request`` is provided, this diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/base.py index bb4cd4ce3617..21e6d28802fe 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/base.py @@ -24,13 +24,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import version from google.cloud.dialogflow_v2.types import version as gcd_version +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc.py index 9c70f21dd541..c48ef4bfc34e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc.py @@ -27,13 +27,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2.types import version +from google.cloud.dialogflow_v2.types import version as gcd_version from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2.types import version -from google.cloud.dialogflow_v2.types import version as gcd_version - from .base import DEFAULT_CLIENT_INFO, VersionsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc_asyncio.py index 5e40aab02ea6..1c656ad1d815 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc_asyncio.py @@ -29,14 +29,13 @@ 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.dialogflow_v2.types import version +from google.cloud.dialogflow_v2.types import version as gcd_version from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2.types import version -from google.cloud.dialogflow_v2.types import version as gcd_version - from .base import DEFAULT_CLIENT_INFO, VersionsTransport from .grpc import VersionsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest.py index b91a1549ece2..b7fce3139812 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest.py @@ -26,14 +26,13 @@ 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.dialogflow_v2.types import version +from google.cloud.dialogflow_v2.types import version as gcd_version from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import version -from google.cloud.dialogflow_v2.types import version as gcd_version - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseVersionsRestTransport @@ -594,10 +593,10 @@ def __call__( can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the `versions and environments guide `__. @@ -876,10 +875,10 @@ def __call__( can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the `versions and environments guide `__. @@ -1194,10 +1193,10 @@ def __call__( can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the `versions and environments guide `__. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest_base.py index ef691c55ad30..89e53a655f0a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest_base.py @@ -19,13 +19,12 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2.types import version +from google.cloud.dialogflow_v2.types import version as gcd_version 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.dialogflow_v2.types import version -from google.cloud.dialogflow_v2.types import version as gcd_version - from .base import DEFAULT_CLIENT_INFO, VersionsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/__init__.py index 672bfeb257f6..e595297116fa 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/__init__.py @@ -55,6 +55,12 @@ TelephonyDtmfEvents, VoiceSelectionParams, ) +from .ces_app import ( + CesAppSpec, +) +from .ces_tool import ( + CesToolSpec, +) from .context import ( Context, CreateContextRequest, @@ -83,6 +89,7 @@ ListMessagesRequest, ListMessagesResponse, SearchKnowledgeAnswer, + SearchKnowledgeDebugInfo, SearchKnowledgeRequest, SearchKnowledgeResponse, SuggestConversationSummaryRequest, @@ -284,20 +291,24 @@ AudioInput, AutomatedAgentReply, CreateParticipantRequest, + DatastoreResponseReason, DialogflowAssistAnswer, DtmfParameters, FaqAnswer, GenerateSuggestionsResponse, GetParticipantRequest, + IngestedContextReferenceDebugInfo, InputTextConfig, IntentSuggestion, KnowledgeAssistAnswer, + KnowledgeAssistDebugInfo, ListParticipantsRequest, ListParticipantsResponse, Message, MessageAnnotation, OutputAudio, Participant, + ServiceLatency, SmartReplyAnswer, StreamingAnalyzeContentRequest, StreamingAnalyzeContentResponse, @@ -361,6 +372,9 @@ ToolCall, ToolCallResult, ) +from .toolset import ( + ToolsetTool, +) from .validation_result import ( ValidationError, ValidationResult, @@ -415,6 +429,8 @@ "SpeechModelVariant", "SsmlVoiceGender", "TelephonyDtmf", + "CesAppSpec", + "CesToolSpec", "Context", "CreateContextRequest", "DeleteAllContextsRequest", @@ -440,6 +456,7 @@ "ListMessagesRequest", "ListMessagesResponse", "SearchKnowledgeAnswer", + "SearchKnowledgeDebugInfo", "SearchKnowledgeRequest", "SearchKnowledgeResponse", "SuggestConversationSummaryRequest", @@ -612,15 +629,18 @@ "FaqAnswer", "GenerateSuggestionsResponse", "GetParticipantRequest", + "IngestedContextReferenceDebugInfo", "InputTextConfig", "IntentSuggestion", "KnowledgeAssistAnswer", + "KnowledgeAssistDebugInfo", "ListParticipantsRequest", "ListParticipantsResponse", "Message", "MessageAnnotation", "OutputAudio", "Participant", + "ServiceLatency", "SmartReplyAnswer", "StreamingAnalyzeContentRequest", "StreamingAnalyzeContentResponse", @@ -635,6 +655,7 @@ "SuggestSmartRepliesRequest", "SuggestSmartRepliesResponse", "UpdateParticipantRequest", + "DatastoreResponseReason", "CloudConversationDebuggingInfo", "DetectIntentRequest", "DetectIntentResponse", @@ -673,6 +694,7 @@ "UpdateToolRequest", "ToolCall", "ToolCallResult", + "ToolsetTool", "ValidationError", "ValidationResult", "CreateVersionRequest", diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/answer_record.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/answer_record.py index 3785c9814da6..4beaec99950e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/answer_record.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/answer_record.py @@ -20,7 +20,6 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2.types import generator, participant __protobuf__ = proto.module( @@ -43,13 +42,13 @@ class AnswerRecord(proto.Message): Currently, answer record includes: - - human agent assistant article suggestion - - human agent assistant faq article + - human agent assistant article suggestion + - human agent assistant faq article It doesn't include: - - ``DetectIntent`` intent matching - - ``DetectIntent`` knowledge + - ``DetectIntent`` intent matching + - ``DetectIntent`` knowledge Answer records are not related to the conversation history in the Dialogflow Console. A Record is generated even when the end-user @@ -124,14 +123,14 @@ class ListAnswerRecordsRequest(proto.Message): The following fields and operators are supported: - - conversation_id with equals(=) operator + - conversation_id with equals(=) operator Examples: - - ``conversation_id=bar`` matches answer records in the - ``projects/foo/locations/global/conversations/bar`` - conversation (assuming the parent is - ``projects/foo/locations/global``). + - ``conversation_id=bar`` matches answer records in the + ``projects/foo/locations/global/conversations/bar`` + conversation (assuming the parent is + ``projects/foo/locations/global``). For more information about filtering, see `API Filtering `__. @@ -308,23 +307,24 @@ class AgentAssistantFeedback(proto.Message): For example: - - Query: "Can I change my mailing address?" - - Suggested document says: "Items must be returned/exchanged - within 60 days of the purchase date." - - [answer_relevance][google.cloud.dialogflow.v2.AgentAssistantFeedback.answer_relevance]: - [AnswerRelevance.IRRELEVANT][google.cloud.dialogflow.v2.AgentAssistantFeedback.AnswerRelevance.IRRELEVANT] + - Query: "Can I change my mailing address?" + - Suggested document says: "Items must be + returned/exchanged within 60 days of the purchase date." + - [answer_relevance][google.cloud.dialogflow.v2.AgentAssistantFeedback.answer_relevance]: + [AnswerRelevance.IRRELEVANT][google.cloud.dialogflow.v2.AgentAssistantFeedback.AnswerRelevance.IRRELEVANT] document_correctness (google.cloud.dialogflow_v2.types.AgentAssistantFeedback.DocumentCorrectness): Optional. Whether or not the information in the document is correct. For example: - - Query: "Can I return the package in 2 days once received?" - - Suggested document says: "Items must be returned/exchanged - within 60 days of the purchase date." - - Ground truth: "No return or exchange is allowed." - - [document_correctness][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_correctness]: - [INCORRECT][google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentCorrectness.INCORRECT] + - Query: "Can I return the package in 2 days once + received?" + - Suggested document says: "Items must be + returned/exchanged within 60 days of the purchase date." + - Ground truth: "No return or exchange is allowed." + - [document_correctness][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_correctness]: + [INCORRECT][google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentCorrectness.INCORRECT] document_efficiency (google.cloud.dialogflow_v2.types.AgentAssistantFeedback.DocumentEfficiency): Optional. Whether or not the suggested document is efficient. For example, if the document is poorly written, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/audio_config.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/audio_config.py index 53c9e1de980a..36d4330b3d4d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/audio_config.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/audio_config.py @@ -198,19 +198,19 @@ class SpeechModelVariant(proto.Enum): USE_ENHANCED (3): Use an enhanced model variant: - - If an enhanced variant does not exist for the given - [model][google.cloud.dialogflow.v2.InputAudioConfig.model] - and request language, Dialogflow falls back to the - standard variant. - - The `Cloud Speech - documentation `__ - describes which models have enhanced variants. - - - If the API caller isn't eligible for enhanced models, - Dialogflow returns an error. Please see the `Dialogflow - docs `__ - for how to make your project eligible. + - If an enhanced variant does not exist for the given + [model][google.cloud.dialogflow.v2.InputAudioConfig.model] + and request language, Dialogflow falls back to the + standard variant. + + The `Cloud Speech + documentation `__ + describes which models have enhanced variants. + + - If the API caller isn't eligible for enhanced models, + Dialogflow returns an error. Please see the `Dialogflow + docs `__ + for how to make your project eligible. """ SPEECH_MODEL_VARIANT_UNSPECIFIED = 0 @@ -292,10 +292,11 @@ class SpeechContext(proto.Message): This list can be used to: - - improve accuracy for words and phrases you expect the user - to say, e.g. typical commands for your Dialogflow agent - - add additional words to the speech recognizer vocabulary - - ... + - improve accuracy for words and phrases you expect the + user to say, e.g. typical commands for your Dialogflow + agent + - add additional words to the speech recognizer vocabulary + - ... See the `Cloud Speech documentation `__ @@ -303,11 +304,11 @@ class SpeechContext(proto.Message): boost (float): Optional. Boost for this context compared to other contexts: - - If the boost is positive, Dialogflow will increase the - probability that the phrases in this context are - recognized over similar sounding phrases. - - If the boost is unspecified or non-positive, Dialogflow - will not apply any boost. + - If the boost is positive, Dialogflow will increase the + probability that the phrases in this context are + recognized over similar sounding phrases. + - If the boost is unspecified or non-positive, Dialogflow + will not apply any boost. Dialogflow recommends that you use boosts in the range (0, 20] and that you find a value that fits your use case with @@ -750,9 +751,9 @@ class SpeechToTextConfig(proto.Message): for more details. If you specify a model, the following models typically have the best performance: - - phone_call (best for Agent Assist and telephony) - - latest_short (best for Dialogflow non-telephony) - - command_and_search + - phone_call (best for Agent Assist and telephony) + - latest_short (best for Dialogflow non-telephony) + - command_and_search Leave this field unspecified to use `Agent Speech settings `__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/ces_app.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/ces_app.py new file mode 100644 index 000000000000..ff548e742ef4 --- /dev/null +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/ces_app.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +from __future__ import annotations + +from typing import MutableMapping, MutableSequence + +import proto # type: ignore +from google.cloud.dialogflow_v2.types import tool + +__protobuf__ = proto.module( + package="google.cloud.dialogflow.v2", + manifest={ + "CesAppSpec", + }, +) + + +class CesAppSpec(proto.Message): + r"""Spec of CES app that the generator can choose from. + + Attributes: + ces_app (str): + Optional. Format: + ``projects//locations//apps/``. + confirmation_requirement (google.cloud.dialogflow_v2.types.Tool.ConfirmationRequirement): + Optional. Indicates whether the app requires + human confirmation. + """ + + ces_app: str = proto.Field( + proto.STRING, + number=1, + ) + confirmation_requirement: tool.Tool.ConfirmationRequirement = proto.Field( + proto.ENUM, + number=2, + enum=tool.Tool.ConfirmationRequirement, + ) + + +__all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/ces_tool.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/ces_tool.py new file mode 100644 index 000000000000..818bc838f749 --- /dev/null +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/ces_tool.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +from __future__ import annotations + +from typing import MutableMapping, MutableSequence + +import proto # type: ignore +from google.cloud.dialogflow_v2.types import tool + +__protobuf__ = proto.module( + package="google.cloud.dialogflow.v2", + manifest={ + "CesToolSpec", + }, +) + + +class CesToolSpec(proto.Message): + r"""Spec of CES tool that the generator can choose from. + + Attributes: + ces_tool (str): + Optional. Format: + ``projects//locations//apps//tools/``. + confirmation_requirement (google.cloud.dialogflow_v2.types.Tool.ConfirmationRequirement): + Optional. Indicates whether the tool requires + human confirmation. + """ + + ces_tool: str = proto.Field( + proto.STRING, + number=1, + ) + confirmation_requirement: tool.Tool.ConfirmationRequirement = proto.Field( + proto.ENUM, + number=2, + enum=tool.Tool.ConfirmationRequirement, + ) + + +__all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/context.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/context.py index 0d92d8fd3e9d..e0e4d3457ad0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/context.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/context.py @@ -73,9 +73,9 @@ class Context(proto.Message): Dialogflow. You should not use these contexts or create contexts with these names: - - ``__system_counters__`` - - ``*_id_dialog_context`` - - ``*_dialog_params_size`` + - ``__system_counters__`` + - ``*_id_dialog_context`` + - ``*_dialog_params_size`` lifespan_count (int): Optional. The number of conversational query requests after which the context expires. The default is ``0``. If set to @@ -91,15 +91,15 @@ class Context(proto.Message): JSON object composed of a collection of (MapKey, MapValue) pairs: - - MapKey type: string - - MapKey value: parameter name - - MapValue type: If parameter's entity type is a composite - entity then use map, otherwise, depending on the parameter - value type, it could be one of string, number, boolean, - null, list or map. - - MapValue value: If parameter's entity type is a composite - entity then use map from composite entity property names - to property values, otherwise, use parameter value. + - MapKey type: string + - MapKey value: parameter name + - MapValue type: If parameter's entity type is a composite + entity then use map, otherwise, depending on the + parameter value type, it could be one of string, number, + boolean, null, list or map. + - MapValue value: If parameter's entity type is a composite + entity then use map from composite entity property names + to property values, otherwise, use parameter value. """ name: str = proto.Field( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation.py index ea07c9f178ca..c013453a4e86 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation.py @@ -20,7 +20,6 @@ import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) @@ -48,6 +47,7 @@ "GenerateStatelessSuggestionRequest", "GenerateStatelessSuggestionResponse", "SearchKnowledgeRequest", + "SearchKnowledgeDebugInfo", "SearchKnowledgeResponse", "SearchKnowledgeAnswer", "GenerateSuggestionsRequest", @@ -105,9 +105,18 @@ class Conversation(proto.Message): telephony_connection_info (google.cloud.dialogflow_v2.types.Conversation.TelephonyConnectionInfo): Output only. The telephony connection information. + initial_conversation_profile (google.cloud.dialogflow_v2.types.ConversationProfile): + Optional. Output only. The initial + conversation profile to be used to configure + this conversation, which is a copy of the + conversation profile config read at conversation + creation time. ingested_context_references (MutableMapping[str, google.cloud.dialogflow_v2.types.Conversation.ContextReference]): Output only. The context reference updates provided by external systems. + initial_generator_contexts (MutableMapping[str, google.cloud.dialogflow_v2.types.Conversation.GeneratorContext]): + Output only. A map with generator name as key + and generator context as value. """ class LifecycleState(proto.Enum): @@ -344,6 +353,48 @@ class ContentFormat(proto.Enum): message=timestamp_pb2.Timestamp, ) + class GeneratorContext(proto.Message): + r"""Represents the context of a generator. + + Attributes: + generator_type (google.cloud.dialogflow_v2.types.Conversation.GeneratorContext.GeneratorType): + Output only. The type of the generator. + """ + + class GeneratorType(proto.Enum): + r"""The available generator types. + + Values: + GENERATOR_TYPE_UNSPECIFIED (0): + Unspecified generator type. + FREE_FORM (1): + Free form generator type. + AGENT_COACHING (2): + Agent coaching generator type. + SUMMARIZATION (3): + Summarization generator type. + TRANSLATION (4): + Translation generator type. + AGENT_FEEDBACK (5): + Agent feedback generator type. + CUSTOMER_MESSAGE_GENERATION (6): + Customer message generation generator type. + """ + + GENERATOR_TYPE_UNSPECIFIED = 0 + FREE_FORM = 1 + AGENT_COACHING = 2 + SUMMARIZATION = 3 + TRANSLATION = 4 + AGENT_FEEDBACK = 5 + CUSTOMER_MESSAGE_GENERATION = 6 + + generator_type: "Conversation.GeneratorContext.GeneratorType" = proto.Field( + proto.ENUM, + number=1, + enum="Conversation.GeneratorContext.GeneratorType", + ) + name: str = proto.Field( proto.STRING, number=1, @@ -382,12 +433,25 @@ class ContentFormat(proto.Enum): number=10, message=TelephonyConnectionInfo, ) + initial_conversation_profile: gcd_conversation_profile.ConversationProfile = ( + proto.Field( + proto.MESSAGE, + number=15, + message=gcd_conversation_profile.ConversationProfile, + ) + ) ingested_context_references: MutableMapping[str, ContextReference] = proto.MapField( proto.STRING, proto.MESSAGE, number=17, message=ContextReference, ) + initial_generator_contexts: MutableMapping[str, GeneratorContext] = proto.MapField( + proto.STRING, + proto.MESSAGE, + number=18, + message=GeneratorContext, + ) class CreateConversationRequest(proto.Message): @@ -767,6 +831,9 @@ class Summary(proto.Message): sections. The key is the section's name and the value is the section's content. There is no specific format for the key or value. + sorted_text_sections (MutableSequence[google.cloud.dialogflow_v2.types.SuggestConversationSummaryResponse.Summary.SummarySection]): + Same as text_sections, but in an order that is consistent + with the order of the sections in the generator. answer_record (str): The name of the answer record. Format: @@ -778,6 +845,25 @@ class Summary(proto.Message): was not used to generate this summary. """ + class SummarySection(proto.Message): + r"""A component of the generated summary. + + Attributes: + section (str): + Output only. Name of the section. + summary (str): + Output only. Summary text for the section. + """ + + section: str = proto.Field( + proto.STRING, + number=1, + ) + summary: str = proto.Field( + proto.STRING, + number=2, + ) + text: str = proto.Field( proto.STRING, number=1, @@ -787,6 +873,13 @@ class Summary(proto.Message): proto.STRING, number=4, ) + sorted_text_sections: MutableSequence[ + "SuggestConversationSummaryResponse.Summary.SummarySection" + ] = proto.RepeatedField( + proto.MESSAGE, + number=6, + message="SuggestConversationSummaryResponse.Summary.SummarySection", + ) answer_record: str = proto.Field( proto.STRING, number=3, @@ -1207,11 +1300,11 @@ class ConditionBoostSpec(proto.Message): The syntax and supported fields are the same as a filter expression. Examples: - - To boost documents with document ID "doc_1" or "doc_2", - and color "Red" or "Blue": + - To boost documents with document ID "doc_1" or "doc_2", + and color "Red" or "Blue": - - (id: ANY("doc_1", "doc_2")) AND (color: - ANY("Red","Blue")) + - (id: ANY("doc_1", "doc_2")) AND (color: + ANY("Red","Blue")) boost (float): Optional. Strength of the condition boost, which should be in [-1, 1]. Negative boost means demotion. Default is 0.0. @@ -1478,6 +1571,75 @@ class FilterSpecs(proto.Message): ) +class SearchKnowledgeDebugInfo(proto.Message): + r"""Debug information related to SearchKnowledge feature. + + Attributes: + datastore_response_reason (google.cloud.dialogflow_v2.types.DatastoreResponseReason): + Response reason from datastore which + indicates data serving status or answer quality + degradation. + search_knowledge_behavior (google.cloud.dialogflow_v2.types.SearchKnowledgeDebugInfo.SearchKnowledgeBehavior): + Configured behaviors for SearchKnowledge. + ingested_context_reference_debug_info (google.cloud.dialogflow_v2.types.IngestedContextReferenceDebugInfo): + Information about parameters ingested for + search knowledge. + service_latency (google.cloud.dialogflow_v2.types.ServiceLatency): + The latency of the service. + """ + + class SearchKnowledgeBehavior(proto.Message): + r"""Configured behaviors for SearchKnowledge. + + Attributes: + answer_generation_rewriter_on (bool): + Whether data store agent rewriter was turned + on for the request. + end_user_metadata_included (bool): + Whether end_user_metadata is included in the data store + agent call. + third_party_connector_allowed (bool): + This field indicates whether third party + connectors are enabled for the project. Note + that this field only indicates if the project is + allowlisted for connectors. + """ + + answer_generation_rewriter_on: bool = proto.Field( + proto.BOOL, + number=1, + ) + end_user_metadata_included: bool = proto.Field( + proto.BOOL, + number=2, + ) + third_party_connector_allowed: bool = proto.Field( + proto.BOOL, + number=4, + ) + + datastore_response_reason: participant.DatastoreResponseReason = proto.Field( + proto.ENUM, + number=1, + enum=participant.DatastoreResponseReason, + ) + search_knowledge_behavior: SearchKnowledgeBehavior = proto.Field( + proto.MESSAGE, + number=2, + message=SearchKnowledgeBehavior, + ) + ingested_context_reference_debug_info: participant.IngestedContextReferenceDebugInfo = proto.Field( + proto.MESSAGE, + number=3, + message=participant.IngestedContextReferenceDebugInfo, + ) + service_latency: participant.ServiceLatency = proto.Field( + proto.MESSAGE, + number=4, + message=participant.ServiceLatency, + ) + + class SearchKnowledgeResponse(proto.Message): r"""The response message for [Conversations.SearchKnowledge][google.cloud.dialogflow.v2.Conversations.SearchKnowledge]. @@ -1489,6 +1651,8 @@ class SearchKnowledgeResponse(proto.Message): confidence. rewritten_query (str): The rewritten query used to search knowledge. + search_knowledge_debug_info (google.cloud.dialogflow_v2.types.SearchKnowledgeDebugInfo): + Debug info for SearchKnowledge. """ answers: MutableSequence["SearchKnowledgeAnswer"] = proto.RepeatedField( @@ -1500,6 +1664,11 @@ class SearchKnowledgeResponse(proto.Message): proto.STRING, number=3, ) + search_knowledge_debug_info: "SearchKnowledgeDebugInfo" = proto.Field( + proto.MESSAGE, + number=4, + message="SearchKnowledgeDebugInfo", + ) class SearchKnowledgeAnswer(proto.Message): diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_dataset.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_dataset.py index 35e4efa4a951..7538f7369be8 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_dataset.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_dataset.py @@ -20,7 +20,6 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2.types import gcs __protobuf__ = proto.module( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_event.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_event.py index 2498c2189264..9870a58eb044 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_event.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_event.py @@ -19,7 +19,6 @@ import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2.types import participant, session __protobuf__ = proto.module( @@ -101,9 +100,9 @@ class Type(proto.Enum): We don't fire this event: - - in an API call because we can directly return the error, - or, - - when we can recover from an error. + - in an API call because we can directly return the error, + or, + - when we can recover from an error. """ TYPE_UNSPECIFIED = 0 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_profile.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_profile.py index 2440aa429235..622a1d528571 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_profile.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_profile.py @@ -21,7 +21,6 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2.types import audio_config, generator, participant __protobuf__ = proto.module( @@ -95,9 +94,9 @@ class ConversationProfile(proto.Message): [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] Pub/Sub message attributes: - - "participant_id" - - "participant_role" - - "message_id". + - "participant_id" + - "participant_role" + - "message_id". stt_config (google.cloud.dialogflow_v2.types.SpeechToTextConfig): Settings for speech transcription. language_code (str): @@ -359,17 +358,17 @@ class AutomatedAgentConfig(proto.Message): ``service-@gcp-sa-dialogflow.iam.gserviceaccount.com`` the ``Dialogflow API Service Agent`` role in this project. - - For ES agents, use format: - ``projects//locations//agent/environments/``. - If environment is not specified, the default ``draft`` - environment is used. Refer to - `DetectIntentRequest `__ - for more details. - - - For CX agents, use format - ``projects//locations//agents//environments/``. - If environment is not specified, the default ``draft`` - environment is used. + - For ES agents, use format: + ``projects//locations//agent/environments/``. + If environment is not specified, the default ``draft`` + environment is used. Refer to + `DetectIntentRequest `__ + for more details. + + - For CX agents, use format + ``projects//locations//agents//environments/``. + If environment is not specified, the default ``draft`` + environment is used. session_ttl (google.protobuf.duration_pb2.Duration): Optional. Configure lifetime of the Dialogflow session. By default, a Dialogflow CX @@ -921,14 +920,14 @@ class ConversationModelConfig(proto.Message): [model][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.ConversationModelConfig.model] is set. Valid versions are: - - Article Suggestion baseline model: + - Article Suggestion baseline model: - - 0.9 - - 1.0 (default) + - 0.9 + - 1.0 (default) - - Summarization baseline model: + - Summarization baseline model: - - 1.0 + - 1.0 """ model: str = proto.Field( @@ -990,6 +989,30 @@ class MessageAnalysisConfig(proto.Message): [ListMessagesResponse.messages.SentimentAnalysisResult][google.cloud.dialogflow.v2.ListMessagesResponse.messages] If Pub/Sub notification is configured, result will be in [ConversationEvent.new_message_payload.SentimentAnalysisResult][google.cloud.dialogflow.v2.ConversationEvent.new_message_payload]. + enable_sentiment_analysis_v3 (bool): + Optional. Enables sentiment analysis for audio input and + conversation messages. If unspecified, defaults to false. If + this flag is set to true, other 'enable_sentiment_analysis' + fields will be ignored. + + Sentiment analysis inspects user input and identifies the + prevailing subjective opinion, especially to determine a + user's attitude as positive, negative, or neutral. + https://cloud.google.com/natural-language/docs/basics#sentiment_analysis + For + [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent] + method, result will be in + [StreamingAnalyzeContentResponse.message.SentimentAnalysisResult][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.message]. + For + [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent] + method, result will be in + [AnalyzeContentResponse.message.SentimentAnalysisResult][google.cloud.dialogflow.v2.AnalyzeContentResponse.message] + For + [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages] + method, result will be in + [ListMessagesResponse.messages.SentimentAnalysisResult][google.cloud.dialogflow.v2.ListMessagesResponse.messages] + If Pub/Sub notification is configured, result will be in + [ConversationEvent.new_message_payload.SentimentAnalysisResult][google.cloud.dialogflow.v2.ConversationEvent.new_message_payload]. """ enable_entity_extraction: bool = proto.Field( @@ -1000,6 +1023,10 @@ class MessageAnalysisConfig(proto.Message): proto.BOOL, number=3, ) + enable_sentiment_analysis_v3: bool = proto.Field( + proto.BOOL, + number=5, + ) notification_config: "NotificationConfig" = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/document.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/document.py index 339a6ef0e79a..9134a798f110 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/document.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/document.py @@ -21,7 +21,6 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2.types import gcs __protobuf__ = proto.module( @@ -300,19 +299,19 @@ class ListDocumentsRequest(proto.Message): The following fields and operators are supported: - - knowledge_types with has(:) operator - - display_name with has(:) operator - - state with equals(=) operator + - knowledge_types with has(:) operator + - display_name with has(:) operator + - state with equals(=) operator Examples: - - "knowledge_types:FAQ" matches documents with FAQ knowledge - type. - - "display_name:customer" matches documents whose display - name contains "customer". - - "state=ACTIVE" matches documents with ACTIVE state. - - "knowledge_types:FAQ AND state=ACTIVE" matches all active - FAQ documents. + - "knowledge_types:FAQ" matches documents with FAQ + knowledge type. + - "display_name:customer" matches documents whose display + name contains "customer". + - "state=ACTIVE" matches documents with ACTIVE state. + - "knowledge_types:FAQ AND state=ACTIVE" matches all active + FAQ documents. For more information about filtering, see `API Filtering `__. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/entity_type.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/entity_type.py index d52d56513054..3d35ca751a8f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/entity_type.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/entity_type.py @@ -132,12 +132,12 @@ class Entity(proto.Message): For ``KIND_MAP`` entity types: - - A reference value to be used in place of synonyms. + - A reference value to be used in place of synonyms. For ``KIND_LIST`` entity types: - - A string that can contain references to other entity types - (with or without aliases). + - A string that can contain references to other entity + types (with or without aliases). synonyms (MutableSequence[str]): Required. A collection of value synonyms. For example, if the entity type is *vegetable*, and ``value`` is @@ -145,8 +145,8 @@ class Entity(proto.Message): For ``KIND_LIST`` entity types: - - This collection must contain exactly one synonym equal to - ``value``. + - This collection must contain exactly one synonym equal to + ``value``. """ value: str = proto.Field( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/environment.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/environment.py index 2f5e36b637c6..466cc1870e0d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/environment.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/environment.py @@ -20,7 +20,6 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2.types import audio_config from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment @@ -54,10 +53,10 @@ class Environment(proto.Message): custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the `versions and environments guide `__. @@ -67,8 +66,8 @@ class Environment(proto.Message): Output only. The unique identifier of this agent environment. Supported formats: - - ``projects//agent/environments/`` - - ``projects//locations//agent/environments/`` + - ``projects//agent/environments/`` + - ``projects//locations//agent/environments/`` The environment ID for the default environment is ``-``. description (str): @@ -80,8 +79,8 @@ class Environment(proto.Message): Optional. The agent version loaded into this environment. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` state (google.cloud.dialogflow_v2.types.Environment.State): Output only. The state of this environment. This field is read-only, i.e., it cannot be set @@ -215,8 +214,8 @@ class ListEnvironmentsRequest(proto.Message): parent (str): Required. The agent to list all environments from. Format: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` page_size (int): Optional. The maximum number of items to return in a single page. By default 100 and at @@ -278,8 +277,8 @@ class GetEnvironmentRequest(proto.Message): name (str): Required. The name of the environment. Supported formats: - - ``projects//agent/environments/`` - - ``projects//locations//agent/environments/`` + - ``projects//agent/environments/`` + - ``projects//locations//agent/environments/`` The environment ID for the default environment is ``-``. """ @@ -299,8 +298,8 @@ class CreateEnvironmentRequest(proto.Message): Required. The agent to create an environment for. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` environment (google.cloud.dialogflow_v2.types.Environment): Required. The environment to create. environment_id (str): @@ -365,8 +364,8 @@ class DeleteEnvironmentRequest(proto.Message): name (str): Required. The name of the environment to delete. / Format: - - ``projects//agent/environments/`` - - ``projects//locations//agent/environments/`` + - ``projects//agent/environments/`` + - ``projects//locations//agent/environments/`` The environment ID for the default environment is ``-``. """ @@ -386,8 +385,8 @@ class GetEnvironmentHistoryRequest(proto.Message): Required. The name of the environment to retrieve history for. Supported formats: - - ``projects//agent/environments/`` - - ``projects//locations//agent/environments/`` + - ``projects//agent/environments/`` + - ``projects//locations//agent/environments/`` The environment ID for the default environment is ``-``. page_size (int): @@ -422,8 +421,8 @@ class EnvironmentHistory(proto.Message): Output only. The name of the environment this history is for. Supported formats: - - ``projects//agent/environments/`` - - ``projects//locations//agent/environments/`` + - ``projects//agent/environments/`` + - ``projects//locations//agent/environments/`` The environment ID for the default environment is ``-``. entries (MutableSequence[google.cloud.dialogflow_v2.types.EnvironmentHistory.Entry]): diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/fulfillment.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/fulfillment.py index 53695f0e4698..2f63e3892345 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/fulfillment.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/fulfillment.py @@ -50,8 +50,8 @@ class Fulfillment(proto.Message): Required. The unique identifier of the fulfillment. Supported formats: - - ``projects//agent/fulfillment`` - - ``projects//locations//agent/fulfillment`` + - ``projects//agent/fulfillment`` + - ``projects//locations//agent/fulfillment`` This field is not used for Fulfillment in an Environment. display_name (str): diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator.py index d3ff39df4db1..9a5597f6d214 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator.py @@ -20,8 +20,12 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore - -from google.cloud.dialogflow_v2.types import agent_coaching_instruction +from google.cloud.dialogflow_v2.types import ( + agent_coaching_instruction, + ces_app, + ces_tool, + toolset, +) from google.cloud.dialogflow_v2.types import tool_call as gcd_tool_call __protobuf__ = proto.module( @@ -657,10 +661,10 @@ class Generator(proto.Message): published_model (str): Optional. The published Large Language Model name. - - To use the latest model version, specify the model name - without version number. Example: ``text-bison`` - - To use a stable model version, specify the version number - as well. Example: ``text-bison@002``. + - To use the latest model version, specify the model name + without version number. Example: ``text-bison`` + - To use a stable model version, specify the version number + as well. Example: ``text-bison@002``. This field is a member of `oneof`_ ``foundation_model``. create_time (google.protobuf.timestamp_pb2.Timestamp): @@ -675,6 +679,15 @@ class Generator(proto.Message): Optional. Configuration for suggestion deduping. This is only applicable to AI Coach feature. + toolset_tools (MutableSequence[google.cloud.dialogflow_v2.types.ToolsetTool]): + Optional. List of CES toolset specs that the + generator can choose from. + ces_tool_specs (MutableSequence[google.cloud.dialogflow_v2.types.CesToolSpec]): + Optional. List of CES tool specs that the + generator can choose from. + ces_app_specs (MutableSequence[google.cloud.dialogflow_v2.types.CesAppSpec]): + Optional. List of CES app specs that the + generator can choose from. """ name: str = proto.Field( @@ -737,6 +750,21 @@ class Generator(proto.Message): number=23, message="SuggestionDedupingConfig", ) + toolset_tools: MutableSequence[toolset.ToolsetTool] = proto.RepeatedField( + proto.MESSAGE, + number=27, + message=toolset.ToolsetTool, + ) + ces_tool_specs: MutableSequence[ces_tool.CesToolSpec] = proto.RepeatedField( + proto.MESSAGE, + number=28, + message=ces_tool.CesToolSpec, + ) + ces_app_specs: MutableSequence[ces_app.CesAppSpec] = proto.RepeatedField( + proto.MESSAGE, + number=29, + message=ces_app.CesAppSpec, + ) class FreeFormSuggestion(proto.Message): @@ -1095,10 +1123,10 @@ class SensitivityLevel(proto.Enum): SENSITIVITY_LEVEL_UNSPECIFIED (0): Default value. If unspecified, the default behavior is: - - DANGEROUS_CONTENT: BLOCK_FEW - - SEXUALLY_EXPLICIT: BLOCK_SOME - - HARASSMENT: BLOCK_SOME - - HATE_SPEECH: BLOCK_SOME + - DANGEROUS_CONTENT: BLOCK_FEW + - SEXUALLY_EXPLICIT: BLOCK_SOME + - HARASSMENT: BLOCK_SOME + - HATE_SPEECH: BLOCK_SOME BLOCK_MOST (1): Block most potentially sensitive responses. BLOCK_SOME (2): diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator_evaluation.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator_evaluation.py index cf5f4054fa35..365c34c4b408 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator_evaluation.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator_evaluation.py @@ -20,7 +20,6 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2.types import generator __protobuf__ = proto.module( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/human_agent_assistant_event.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/human_agent_assistant_event.py index b7d20adbd244..ad20b0534f98 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/human_agent_assistant_event.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/human_agent_assistant_event.py @@ -18,7 +18,6 @@ from typing import MutableMapping, MutableSequence import proto # type: ignore - from google.cloud.dialogflow_v2.types import participant as gcd_participant __protobuf__ = proto.module( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/intent.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/intent.py index 4d2c65fabd07..5cc093fb67d0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/intent.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/intent.py @@ -20,7 +20,6 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2.types import context __protobuf__ = proto.module( @@ -89,11 +88,11 @@ class Intent(proto.Message): Optional. The priority of this intent. Higher numbers represent higher priorities. - - If the supplied value is unspecified or 0, the service - translates the value to 500,000, which corresponds to the - ``Normal`` priority in the console. - - If the supplied value is negative, the intent is ignored - in runtime detect intent requests. + - If the supplied value is unspecified or 0, the service + translates the value to 500,000, which corresponds to the + ``Normal`` priority in the console. + - If the supplied value is negative, the intent is ignored + in runtime detect intent requests. is_fallback (bool): Optional. Indicates whether this is a fallback intent. @@ -227,11 +226,11 @@ class TrainingPhrase(proto.Message): multiple parts, where the fields of each part are populated in one of two ways: - - ``Part.text`` is set to a part of the phrase that has no - parameters. - - ``Part.text`` is set to a part of the phrase that you want - to annotate, and the ``entity_type``, ``alias``, and - ``user_defined`` fields are all set. + - ``Part.text`` is set to a part of the phrase that has no + parameters. + - ``Part.text`` is set to a part of the phrase that you + want to annotate, and the ``entity_type``, ``alias``, and + ``user_defined`` fields are all set. times_added_count (int): Optional. Indicates how many times this example was added to the intent. Each time a @@ -334,12 +333,12 @@ class Parameter(proto.Message): value (str): Optional. The definition of the parameter value. It can be: - - a constant string, - - a parameter value defined as ``$parameter_name``, - - an original parameter value defined as - ``$parameter_name.original``, - - a parameter value from some context defined as - ``#context_name.parameter_name``. + - a constant string, + - a parameter value defined as ``$parameter_name``, + - an original parameter value defined as + ``$parameter_name.original``, + - a parameter value from some context defined as + ``#context_name.parameter_name``. default_value (str): Optional. The default value to use when the ``value`` yields an empty result. Default values can be extracted from diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/knowledge_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/knowledge_base.py index 9e3eb1638696..39c12dfdc336 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/knowledge_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/knowledge_base.py @@ -101,20 +101,20 @@ class ListKnowledgeBasesRequest(proto.Message): The following fields and operators are supported: - - display_name with has(:) operator - - language_code with equals(=) operator + - display_name with has(:) operator + - language_code with equals(=) operator Examples: - - 'language_code=en-us' matches knowledge bases with en-us - language code. - - 'display_name:articles' matches knowledge bases whose - display name contains "articles". - - 'display_name:"Best Articles"' matches knowledge bases - whose display name contains "Best Articles". - - 'language_code=en-gb AND display_name=articles' matches - all knowledge bases whose display name contains "articles" - and whose language code is "en-gb". + - 'language_code=en-us' matches knowledge bases with en-us + language code. + - 'display_name:articles' matches knowledge bases whose + display name contains "articles". + - 'display_name:"Best Articles"' matches knowledge bases + whose display name contains "Best Articles". + - 'language_code=en-gb AND display_name=articles' matches + all knowledge bases whose display name contains + "articles" and whose language code is "en-gb". Note: An empty filter string (i.e. "") is a no-op and will result in no filtering. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/participant.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/participant.py index d4cf47ffa434..7ffeea64edd8 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/participant.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/participant.py @@ -22,13 +22,13 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2.types import audio_config as gcd_audio_config from google.cloud.dialogflow_v2.types import generator, session __protobuf__ = proto.module( package="google.cloud.dialogflow.v2", manifest={ + "DatastoreResponseReason", "Participant", "Message", "CreateParticipantRequest", @@ -64,11 +64,57 @@ "AssistQueryParameters", "SuggestKnowledgeAssistRequest", "SuggestKnowledgeAssistResponse", + "IngestedContextReferenceDebugInfo", + "ServiceLatency", + "KnowledgeAssistDebugInfo", "KnowledgeAssistAnswer", }, ) +class DatastoreResponseReason(proto.Enum): + r"""Response reason from datastore which indicates data serving + status or answer quality degradation. + + Values: + DATASTORE_RESPONSE_REASON_UNSPECIFIED (0): + Default value. + NONE (1): + No specific response reason from datastore. + SEARCH_OUT_OF_QUOTA (2): + Search is blocked due to out of quota. + SEARCH_EMPTY_RESULTS (3): + Search returns empty results. + ANSWER_GENERATION_GEN_AI_DISABLED (4): + Generative AI is disabled. + ANSWER_GENERATION_OUT_OF_QUOTA (5): + Answer generation is blocked due to out of + quota. + ANSWER_GENERATION_ERROR (6): + Answer generation encounters an error. + ANSWER_GENERATION_NOT_ENOUGH_INFO (7): + Answer generation does not have enough + information to generate answer. + ANSWER_GENERATION_RAI_FAILED (8): + Answer generation is blocked by RAI + (Responsible AI) failure. + ANSWER_GENERATION_NOT_GROUNDED (9): + Answer generation is not grounded on reliable + sources. + """ + + DATASTORE_RESPONSE_REASON_UNSPECIFIED = 0 + NONE = 1 + SEARCH_OUT_OF_QUOTA = 2 + SEARCH_EMPTY_RESULTS = 3 + ANSWER_GENERATION_GEN_AI_DISABLED = 4 + ANSWER_GENERATION_OUT_OF_QUOTA = 5 + ANSWER_GENERATION_ERROR = 6 + ANSWER_GENERATION_NOT_ENOUGH_INFO = 7 + ANSWER_GENERATION_RAI_FAILED = 8 + ANSWER_GENERATION_NOT_GROUNDED = 9 + + class Participant(proto.Message): r"""Represents a conversation participant (human agent, virtual agent, end-user). @@ -118,11 +164,11 @@ class Participant(proto.Message): Note: - - Please never pass raw user ids to Dialogflow. Always - obfuscate your user id first. - - Dialogflow only accepts a UTF-8 encoded string, e.g., a - hex digest of a hash function like SHA-512. - - The length of the user id must be <= 256 characters. + - Please never pass raw user ids to Dialogflow. Always + obfuscate your user id first. + - Dialogflow only accepts a UTF-8 encoded string, e.g., a + hex digest of a hash function like SHA-512. + - The length of the user id must be <= 256 characters. documents_metadata_filters (MutableMapping[str, str]): Optional. Key-value filters on the metadata of documents returned by article suggestion. If specified, article @@ -579,10 +625,10 @@ class AnalyzeContentResponse(proto.Message): The audio data bytes encoded as specified in the request. This field is set if: - - ``reply_audio_config`` was specified in the request, or - - The automated agent responded with audio to play to the - user. In such case, ``reply_audio.config`` contains - settings used to synthesize the speech. + - ``reply_audio_config`` was specified in the request, or + - The automated agent responded with audio to play to the + user. In such case, ``reply_audio.config`` contains + settings used to synthesize the speech. In some scenarios, multiple output audio fields may be present in the response structure. In these cases, only the @@ -688,9 +734,9 @@ class StreamingAnalyzeContentRequest(proto.Message): [input_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.input_audio] to continue with Speech recognition. However, note that: - - Dialogflow will bill you for the audio so far. - - Dialogflow discards all Speech recognition results in favor of - the text input. + - Dialogflow will bill you for the audio so far. + - Dialogflow discards all Speech recognition results in favor of + the text input. 3. If [StreamingAnalyzeContentRequest.config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config] @@ -773,15 +819,15 @@ class StreamingAnalyzeContentRequest(proto.Message): Restrictions: - - Timeout: 3 mins. - - Audio Encoding: only supports - [AudioEncoding.AUDIO_ENCODING_LINEAR_16][google.cloud.dialogflow.v2.AudioEncoding.AUDIO_ENCODING_LINEAR_16] - and - [AudioEncoding.AUDIO_ENCODING_MULAW][google.cloud.dialogflow.v2.AudioEncoding.AUDIO_ENCODING_MULAW] - - Lifecycle: conversation should be in ``Assist Stage``, go - to - [Conversations.CreateConversation][google.cloud.dialogflow.v2.Conversations.CreateConversation] - for more information. + - Timeout: 3 mins. + - Audio Encoding: only supports + [AudioEncoding.AUDIO_ENCODING_LINEAR_16][google.cloud.dialogflow.v2.AudioEncoding.AUDIO_ENCODING_LINEAR_16] + and + [AudioEncoding.AUDIO_ENCODING_MULAW][google.cloud.dialogflow.v2.AudioEncoding.AUDIO_ENCODING_MULAW] + - Lifecycle: conversation should be in ``Assist Stage``, go + to + [Conversations.CreateConversation][google.cloud.dialogflow.v2.Conversations.CreateConversation] + for more information. InvalidArgument Error will be returned if the one of restriction checks failed. @@ -794,6 +840,11 @@ class StreamingAnalyzeContentRequest(proto.Message): only one final response even if some ``Fulfillment``\ s in Dialogflow CX agent have been configured to return partial responses. + output_multiple_utterances (bool): + Optional. If multiple uttereances are + detected in the audio stream, process them + individually instead of stitching them together + to form a single utterance. enable_debugging_info (bool): If true, ``StreamingAnalyzeContentResponse.debugging_info`` will get populated. @@ -859,6 +910,10 @@ class StreamingAnalyzeContentRequest(proto.Message): proto.BOOL, number=12, ) + output_multiple_utterances: bool = proto.Field( + proto.BOOL, + number=18, + ) enable_debugging_info: bool = proto.Field( proto.BOOL, number=19, @@ -903,12 +958,12 @@ class StreamingAnalyzeContentResponse(proto.Message): The audio data bytes encoded as specified in the request. This field is set if: - - The ``reply_audio_config`` field is specified in the - request. - - The automated agent, which this output comes from, - responded with audio. In such case, the - ``reply_audio.config`` field contains settings used to - synthesize the speech. + - The ``reply_audio_config`` field is specified in the + request. + - The automated agent, which this output comes from, + responded with audio. In such case, the + ``reply_audio.config`` field contains settings used to + synthesize the speech. In some scenarios, multiple output audio fields may be present in the response structure. In these cases, only the @@ -1989,6 +2044,406 @@ class SuggestKnowledgeAssistResponse(proto.Message): ) +class IngestedContextReferenceDebugInfo(proto.Message): + r"""Debug information related to ingested context reference. + + Attributes: + project_not_allowlisted (bool): + Indicates if the project is allowlisted to + use ingested context reference. + context_reference_retrieved (bool): + The status of context_reference retrieval from database. + ingested_parameters_debug_info (MutableSequence[google.cloud.dialogflow_v2.types.IngestedContextReferenceDebugInfo.IngestedParameterDebugInfo]): + Parameters ingested from the context + reference. + """ + + class IngestedParameterDebugInfo(proto.Message): + r"""Debug information related to ingested parameters from context + reference. + + Attributes: + parameter (str): + The name of the parameter in the context + reference. + ingestion_status (google.cloud.dialogflow_v2.types.IngestedContextReferenceDebugInfo.IngestedParameterDebugInfo.IngestionStatus): + The ingestion status for this specific + parameter. + """ + + class IngestionStatus(proto.Enum): + r"""Enum representing the various states of parameter ingestion. + + Values: + INGESTION_STATUS_UNSPECIFIED (0): + Default value, indicates that the ingestion + status is not specified. + INGESTION_STATUS_SUCCEEDED (1): + Indicates that the parameter was successfully + ingested. + INGESTION_STATUS_CONTEXT_NOT_AVAILABLE (2): + Indicates that the parameter was not + available for ingestion. + INGESTION_STATUS_PARSE_FAILED (3): + Indicates that there was a failure parsing + the parameter content. + INGESTION_STATUS_INVALID_ENTRY (4): + Indicates that the context reference had an + unexpected number of content entries as Context + reference should only have one entry. + INGESTION_STATUS_INVALID_FORMAT (5): + Indicates that the context reference content + was not in the expected format (e.g., JSON). + INGESTION_STATUS_LANGUAGE_MISMATCH (6): + Indicates that the context reference language + does not match the conversation language. + """ + + INGESTION_STATUS_UNSPECIFIED = 0 + INGESTION_STATUS_SUCCEEDED = 1 + INGESTION_STATUS_CONTEXT_NOT_AVAILABLE = 2 + INGESTION_STATUS_PARSE_FAILED = 3 + INGESTION_STATUS_INVALID_ENTRY = 4 + INGESTION_STATUS_INVALID_FORMAT = 5 + INGESTION_STATUS_LANGUAGE_MISMATCH = 6 + + parameter: str = proto.Field( + proto.STRING, + number=1, + ) + ingestion_status: "IngestedContextReferenceDebugInfo.IngestedParameterDebugInfo.IngestionStatus" = proto.Field( + proto.ENUM, + number=2, + enum="IngestedContextReferenceDebugInfo.IngestedParameterDebugInfo.IngestionStatus", + ) + + project_not_allowlisted: bool = proto.Field( + proto.BOOL, + number=1, + ) + context_reference_retrieved: bool = proto.Field( + proto.BOOL, + number=2, + ) + ingested_parameters_debug_info: MutableSequence[IngestedParameterDebugInfo] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=IngestedParameterDebugInfo, + ) + ) + + +class ServiceLatency(proto.Message): + r"""Message to represent the latency of the service. + + Attributes: + internal_service_latencies (MutableSequence[google.cloud.dialogflow_v2.types.ServiceLatency.InternalServiceLatency]): + A list of internal service latencies. + """ + + class InternalServiceLatency(proto.Message): + r"""Message to represent the latency of an internal service. + + Attributes: + step (str): + The name of the internal service. + latency_ms (float): + The latency of the internal service in + milliseconds. + start_time (google.protobuf.timestamp_pb2.Timestamp): + The start time of the internal service. + complete_time (google.protobuf.timestamp_pb2.Timestamp): + The completion time of the internal service. + """ + + step: str = proto.Field( + proto.STRING, + number=1, + ) + latency_ms: float = proto.Field( + proto.FLOAT, + number=2, + ) + start_time: timestamp_pb2.Timestamp = proto.Field( + proto.MESSAGE, + number=3, + message=timestamp_pb2.Timestamp, + ) + complete_time: timestamp_pb2.Timestamp = proto.Field( + proto.MESSAGE, + number=4, + message=timestamp_pb2.Timestamp, + ) + + internal_service_latencies: MutableSequence[InternalServiceLatency] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=InternalServiceLatency, + ) + ) + + +class KnowledgeAssistDebugInfo(proto.Message): + r"""Debug information related to Knowledge Assist feature. + + Attributes: + query_generation_failure_reason (google.cloud.dialogflow_v2.types.KnowledgeAssistDebugInfo.QueryGenerationFailureReason): + Reason for query generation. + query_categorization_failure_reason (google.cloud.dialogflow_v2.types.KnowledgeAssistDebugInfo.QueryCategorizationFailureReason): + Reason for query categorization. + datastore_response_reason (google.cloud.dialogflow_v2.types.DatastoreResponseReason): + Response reason from datastore which + indicates data serving status or answer quality + degradation. + knowledge_assist_behavior (google.cloud.dialogflow_v2.types.KnowledgeAssistDebugInfo.KnowledgeAssistBehavior): + Configured behaviors for Knowedge Assist. + ingested_context_reference_debug_info (google.cloud.dialogflow_v2.types.IngestedContextReferenceDebugInfo): + Information about parameters ingested for + search knowledge. + service_latency (google.cloud.dialogflow_v2.types.ServiceLatency): + The latency of the service. + """ + + class QueryGenerationFailureReason(proto.Enum): + r"""Reason for query generation failure. + + Values: + QUERY_GENERATION_FAILURE_REASON_UNSPECIFIED (0): + Default value. + QUERY_GENERATION_OUT_OF_QUOTA (1): + Query generation is blocked due to out of + quota. + QUERY_GENERATION_FAILED (2): + Call to Knowedge Assist query generation + model fails. + QUERY_GENERATION_NO_QUERY_GENERATED (3): + Query generation model decides that there is + no new topic change or there has been similar + queries generated in the previous turns. + QUERY_GENERATION_RAI_FAILED (4): + Knowedge Assist generated query is blocked by + RAI (Responsible AI). + NOT_IN_ALLOWLIST (5): + Query generation is blocked by Knowledge + Assist conversation profile level / agent id + level filtering. + QUERY_GENERATION_QUERY_REDACTED (6): + The generated query is blocked due to + redaction. + QUERY_GENERATION_LLM_RESPONSE_PARSE_FAILED (10): + Query generation failed due to LLM response + parse failure. + QUERY_GENERATION_EMPTY_CONVERSATION (11): + The conversation has no messages. + QUERY_GENERATION_EMPTY_LAST_MESSAGE (12): + The last message in the conversation is + empty. + QUERY_GENERATION_TRIGGERING_EVENT_CONDITION_NOT_MET (13): + The trigger event condition is not met. This occurs in the + following scenarios: + + 1. The trigger_event is CUSTOMER_MESSAGE or UNSPECIFIED, but + the last message is not from the customer. + 2. The trigger_event is AGENT_MESSAGE, but the last message + is not from the agent. + """ + + QUERY_GENERATION_FAILURE_REASON_UNSPECIFIED = 0 + QUERY_GENERATION_OUT_OF_QUOTA = 1 + QUERY_GENERATION_FAILED = 2 + QUERY_GENERATION_NO_QUERY_GENERATED = 3 + QUERY_GENERATION_RAI_FAILED = 4 + NOT_IN_ALLOWLIST = 5 + QUERY_GENERATION_QUERY_REDACTED = 6 + QUERY_GENERATION_LLM_RESPONSE_PARSE_FAILED = 10 + QUERY_GENERATION_EMPTY_CONVERSATION = 11 + QUERY_GENERATION_EMPTY_LAST_MESSAGE = 12 + QUERY_GENERATION_TRIGGERING_EVENT_CONDITION_NOT_MET = 13 + + class QueryCategorizationFailureReason(proto.Enum): + r"""Reason for query categorization failure. + + Values: + QUERY_CATEGORIZATION_FAILURE_REASON_UNSPECIFIED (0): + Default value. + QUERY_CATEGORIZATION_INVALID_CONFIG (1): + Vertex AI Search config supplied for query + categorization is invalid. + QUERY_CATEGORIZATION_RESULT_NOT_FOUND (2): + Vertex AI Search result does not contain a + query categorization result. + QUERY_CATEGORIZATION_FAILED (3): + Vertex AI Search call fails. + """ + + QUERY_CATEGORIZATION_FAILURE_REASON_UNSPECIFIED = 0 + QUERY_CATEGORIZATION_INVALID_CONFIG = 1 + QUERY_CATEGORIZATION_RESULT_NOT_FOUND = 2 + QUERY_CATEGORIZATION_FAILED = 3 + + class KnowledgeAssistBehavior(proto.Message): + r"""Configured behaviors for Knowedge Assist. + + Attributes: + answer_generation_rewriter_on (bool): + Whether data store agent rewriter was turned + off for the request. + end_user_metadata_included (bool): + Whether end_user_metadata is included in the data store + agent call. + return_query_only (bool): + Whether customers configured to return query + only in the conversation profile. + use_pubsub_delivery (bool): + Whether customers configured to use pubsub to + deliver. + disable_sync_delivery (bool): + Whether customers configured to disable the + synchronous delivery of Knowedge Assist + response. + previous_queries_included (bool): + Whether previously suggested queries are + included in the query generation process. + use_translated_message (bool): + Translated message is included in query + generation process. + use_custom_safety_filter_level (bool): + Safety filter is adjusted by user. + conversation_transcript_has_mixed_languages (bool): + Conversation transcript has mixed languages. + query_generation_agent_language_mismatch (bool): + Whether the agent language from the + translation generator mismatches the end-user + language. + query_generation_end_user_language_mismatch (bool): + Whether the end-user language from the + translation generator mismatches the end-user + language. + third_party_connector_allowed (bool): + This field indicates whether third party + connectors are enabled for the project + multiple_queries_generated (bool): + Indicates that the query generation model + generated multiple queries. + query_contained_search_context (bool): + Indicates that the generated query contains + search context. + invalid_items_query_suggestion_skipped (bool): + Indicates that invalid items were skipped + when parsing the LLM response. + primary_query_redacted_and_replaced (bool): + True if the primary suggested query was + redacted and replaced by an additional query. + appended_search_context_count (int): + The number of search contexts appended to the + query. + """ + + answer_generation_rewriter_on: bool = proto.Field( + proto.BOOL, + number=1, + ) + end_user_metadata_included: bool = proto.Field( + proto.BOOL, + number=2, + ) + return_query_only: bool = proto.Field( + proto.BOOL, + number=4, + ) + use_pubsub_delivery: bool = proto.Field( + proto.BOOL, + number=5, + ) + disable_sync_delivery: bool = proto.Field( + proto.BOOL, + number=6, + ) + previous_queries_included: bool = proto.Field( + proto.BOOL, + number=7, + ) + use_translated_message: bool = proto.Field( + proto.BOOL, + number=8, + ) + use_custom_safety_filter_level: bool = proto.Field( + proto.BOOL, + number=9, + ) + conversation_transcript_has_mixed_languages: bool = proto.Field( + proto.BOOL, + number=10, + ) + query_generation_agent_language_mismatch: bool = proto.Field( + proto.BOOL, + number=11, + ) + query_generation_end_user_language_mismatch: bool = proto.Field( + proto.BOOL, + number=12, + ) + third_party_connector_allowed: bool = proto.Field( + proto.BOOL, + number=13, + ) + multiple_queries_generated: bool = proto.Field( + proto.BOOL, + number=14, + ) + query_contained_search_context: bool = proto.Field( + proto.BOOL, + number=15, + ) + invalid_items_query_suggestion_skipped: bool = proto.Field( + proto.BOOL, + number=16, + ) + primary_query_redacted_and_replaced: bool = proto.Field( + proto.BOOL, + number=17, + ) + appended_search_context_count: int = proto.Field( + proto.INT32, + number=18, + ) + + query_generation_failure_reason: QueryGenerationFailureReason = proto.Field( + proto.ENUM, + number=1, + enum=QueryGenerationFailureReason, + ) + query_categorization_failure_reason: QueryCategorizationFailureReason = proto.Field( + proto.ENUM, + number=2, + enum=QueryCategorizationFailureReason, + ) + datastore_response_reason: "DatastoreResponseReason" = proto.Field( + proto.ENUM, + number=3, + enum="DatastoreResponseReason", + ) + knowledge_assist_behavior: KnowledgeAssistBehavior = proto.Field( + proto.MESSAGE, + number=4, + message=KnowledgeAssistBehavior, + ) + ingested_context_reference_debug_info: "IngestedContextReferenceDebugInfo" = ( + proto.Field( + proto.MESSAGE, + number=5, + message="IngestedContextReferenceDebugInfo", + ) + ) + service_latency: "ServiceLatency" = proto.Field( + proto.MESSAGE, + number=6, + message="ServiceLatency", + ) + + class KnowledgeAssistAnswer(proto.Message): r"""Represents a Knowledge Assist answer. @@ -2004,6 +2459,9 @@ class KnowledgeAssistAnswer(proto.Message): answer_record (str): The name of the answer record. Format: ``projects//locations//answer Records/``. + knowledge_assist_debug_info (google.cloud.dialogflow_v2.types.KnowledgeAssistDebugInfo): + Debug information related to Knowledge Assist + feature. """ class SuggestedQuery(proto.Message): @@ -2139,6 +2597,11 @@ class Snippet(proto.Message): proto.STRING, number=3, ) + knowledge_assist_debug_info: "KnowledgeAssistDebugInfo" = proto.Field( + proto.MESSAGE, + number=7, + message="KnowledgeAssistDebugInfo", + ) __all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session.py index 498d11d114d1..2086480689f6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session.py @@ -23,7 +23,6 @@ import google.rpc.status_pb2 as status_pb2 # type: ignore import google.type.latlng_pb2 as latlng_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2.types import audio_config as gcd_audio_config from google.cloud.dialogflow_v2.types import context, session_entity_type from google.cloud.dialogflow_v2.types import intent as gcd_intent @@ -362,14 +361,14 @@ class QueryResult(proto.Message): query_text (str): The original conversational query text: - - If natural language text was provided as input, - ``query_text`` contains a copy of the input. - - If natural language speech audio was provided as input, - ``query_text`` contains the speech recognition result. If - speech recognizer produced multiple alternatives, a - particular one is picked. - - If automatic spell correction is enabled, ``query_text`` - will contain the corrected user input. + - If natural language text was provided as input, + ``query_text`` contains a copy of the input. + - If natural language speech audio was provided as input, + ``query_text`` contains the speech recognition result. If + speech recognizer produced multiple alternatives, a + particular one is picked. + - If automatic spell correction is enabled, ``query_text`` + will contain the corrected user input. language_code (str): The language that was triggered during intent detection. See `Language @@ -396,24 +395,24 @@ class QueryResult(proto.Message): JSON object composed of a collection of (MapKey, MapValue) pairs: - - MapKey type: string - - MapKey value: parameter name - - MapValue type: If parameter's entity type is a composite - entity then use map, otherwise, depending on the parameter - value type, it could be one of string, number, boolean, - null, list or map. - - MapValue value: If parameter's entity type is a composite - entity then use map from composite entity property names - to property values, otherwise, use parameter value. + - MapKey type: string + - MapKey value: parameter name + - MapValue type: If parameter's entity type is a composite + entity then use map, otherwise, depending on the + parameter value type, it could be one of string, number, + boolean, null, list or map. + - MapValue value: If parameter's entity type is a composite + entity then use map from composite entity property names + to property values, otherwise, use parameter value. all_required_params_present (bool): This field is set to: - - ``false`` if the matched intent has required parameters - and not all of the required parameter values have been - collected. - - ``true`` if all required parameter values have been - collected, or if the matched intent doesn't contain any - required parameters. + - ``false`` if the matched intent has required parameters + and not all of the required parameter values have been + collected. + - ``true`` if all required parameter values have been + collected, or if the matched intent doesn't contain any + required parameters. cancels_slot_filling (bool): Indicates whether the conversational query triggers a cancellation for slot filling. For more information, see the @@ -576,10 +575,10 @@ class StreamingDetectIntentRequest(proto.Message): However, note that: - - Dialogflow will bill you for the audio duration so far. - - Dialogflow discards all Speech recognition results in favor of - the input text. - - Dialogflow will use the language code from the first message. + - Dialogflow will bill you for the audio duration so far. + - Dialogflow discards all Speech recognition results in favor of + the input text. + - Dialogflow will use the language code from the first message. After you sent all input, you must half-close or abort the request stream. @@ -1118,15 +1117,15 @@ class EventInput(proto.Message): JSON object composed of a collection of (MapKey, MapValue) pairs: - - MapKey type: string - - MapKey value: parameter name - - MapValue type: If parameter's entity type is a composite - entity then use map, otherwise, depending on the parameter - value type, it could be one of string, number, boolean, - null, list or map. - - MapValue value: If parameter's entity type is a composite - entity then use map from composite entity property names - to property values, otherwise, use parameter value. + - MapKey type: string + - MapKey value: parameter name + - MapValue type: If parameter's entity type is a composite + entity then use map, otherwise, depending on the + parameter value type, it could be one of string, number, + boolean, null, list or map. + - MapValue value: If parameter's entity type is a composite + entity then use map from composite entity property names + to property values, otherwise, use parameter value. language_code (str): Required. The language of this query. See `Language Support `__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session_entity_type.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session_entity_type.py index 2f5a1d92a78f..910427ab3c46 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session_entity_type.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session_entity_type.py @@ -19,7 +19,6 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2.types import entity_type __protobuf__ = proto.module( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool_call.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool_call.py index 912568c6f8d0..d1edc4e4ad90 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool_call.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool_call.py @@ -34,6 +34,10 @@ class ToolCall(proto.Message): r"""Represents a call of a specific tool's action with the specified inputs. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields @@ -43,6 +47,21 @@ class ToolCall(proto.Message): associated with this call. Format: ``projects//locations//tools/``. + This field is a member of `oneof`_ ``source``. + ces_tool (str): + Optional. CES tool name for this call. Format: + ``projects//locations//apps//tools/``. + + This field is a member of `oneof`_ ``source``. + ces_toolset (str): + Optional. CES toolset name for this call. Format: + ``projects//locations//apps//toolsets/ToolsetID>``. + + This field is a member of `oneof`_ ``source``. + ces_app (str): + Optional. CES app name for this call. Format: + ``projects//locations//apps/``. + This field is a member of `oneof`_ ``source``. tool_display_name (str): Optional. A human readable short name of the @@ -86,6 +105,21 @@ class State(proto.Enum): number=1, oneof="source", ) + ces_tool: str = proto.Field( + proto.STRING, + number=11, + oneof="source", + ) + ces_toolset: str = proto.Field( + proto.STRING, + number=12, + oneof="source", + ) + ces_app: str = proto.Field( + proto.STRING, + number=8, + oneof="source", + ) tool_display_name: str = proto.Field( proto.STRING, number=9, @@ -135,6 +169,21 @@ class ToolCallResult(proto.Message): associated with this call. Format: ``projects//locations//tools/``. + This field is a member of `oneof`_ ``source``. + ces_toolset (str): + Optional. CES toolset name for this call. Format: + ``projects//locations//apps//toolsets/ToolsetID>``. + + This field is a member of `oneof`_ ``source``. + ces_tool (str): + Optional. CES tool name for this call. Format: + ``projects//locations//apps//tools/``. + + This field is a member of `oneof`_ ``source``. + ces_app (str): + Optional. CES app name for this call. Format: + ``projects//locations//apps/``. + This field is a member of `oneof`_ ``source``. action (str): Optional. The name of the tool's action @@ -180,6 +229,21 @@ class Error(proto.Message): number=1, oneof="source", ) + ces_toolset: str = proto.Field( + proto.STRING, + number=13, + oneof="source", + ) + ces_tool: str = proto.Field( + proto.STRING, + number=12, + oneof="source", + ) + ces_app: str = proto.Field( + proto.STRING, + number=11, + oneof="source", + ) action: str = proto.Field( proto.STRING, number=2, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/toolset.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/toolset.py new file mode 100644 index 000000000000..7e5cdc34a3de --- /dev/null +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/toolset.py @@ -0,0 +1,63 @@ +# -*- coding: utf-8 -*- +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +from __future__ import annotations + +from typing import MutableMapping, MutableSequence + +import proto # type: ignore +from google.cloud.dialogflow_v2.types import tool + +__protobuf__ = proto.module( + package="google.cloud.dialogflow.v2", + manifest={ + "ToolsetTool", + }, +) + + +class ToolsetTool(proto.Message): + r"""A tool that is created from a toolset. + + Attributes: + toolset (str): + Required. The name of the toolset to retrieve the schema + for. Format: + ``projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}`` + operation_id (str): + Optional. The operationId field of the + OpenAPI endpoint. The operationId must be + present in the toolset's definition. + confirmation_requirement (google.cloud.dialogflow_v2.types.Tool.ConfirmationRequirement): + Optional. Indicates whether the tool requires + human confirmation. + """ + + toolset: str = proto.Field( + proto.STRING, + number=1, + ) + operation_id: str = proto.Field( + proto.STRING, + number=2, + ) + confirmation_requirement: tool.Tool.ConfirmationRequirement = proto.Field( + proto.ENUM, + number=3, + enum=tool.Tool.ConfirmationRequirement, + ) + + +__all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/validation_result.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/validation_result.py index ef1f64474b8c..c359fa630bd4 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/validation_result.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/validation_result.py @@ -38,17 +38,18 @@ class ValidationError(proto.Message): The names of the entries that the error is associated with. Format: - - ``projects//agent``, if the error is - associated with the entire agent. - - ``projects//agent/intents/``, if - the error is associated with certain intents. - - ``projects//agent/intents//trainingPhrases/``, - if the error is associated with certain intent training - phrases. - - ``projects//agent/intents//parameters/``, - if the error is associated with certain intent parameters. - - ``projects//agent/entities/``, if - the error is associated with certain entities. + - ``projects//agent``, if the error is + associated with the entire agent. + - ``projects//agent/intents/``, if + the error is associated with certain intents. + - ``projects//agent/intents//trainingPhrases/``, + if the error is associated with certain intent training + phrases. + - ``projects//agent/intents//parameters/``, + if the error is associated with certain intent + parameters. + - ``projects//agent/entities/``, if + the error is associated with certain entities. error_message (str): The detailed error message. """ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/version.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/version.py index 5451603429fa..d5bbfb85607a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/version.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/version.py @@ -48,10 +48,10 @@ class Version(proto.Message): custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the `versions and environments guide `__. @@ -61,8 +61,8 @@ class Version(proto.Message): Output only. The unique identifier of this agent version. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` description (str): Optional. The developer-provided description of this version. @@ -133,8 +133,8 @@ class ListVersionsRequest(proto.Message): Required. The agent to list all versions from. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` page_size (int): Optional. The maximum number of items to return in a single page. By default 100 and at @@ -196,8 +196,8 @@ class GetVersionRequest(proto.Message): name (str): Required. The name of the version. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` """ name: str = proto.Field( @@ -215,8 +215,8 @@ class CreateVersionRequest(proto.Message): Required. The agent to create a version for. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` version (google.cloud.dialogflow_v2.types.Version): Required. The version to create. """ @@ -240,8 +240,8 @@ class UpdateVersionRequest(proto.Message): version (google.cloud.dialogflow_v2.types.Version): Required. The version to update. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` update_mask (google.protobuf.field_mask_pb2.FieldMask): Required. The mask to control which fields get updated. @@ -268,8 +268,8 @@ class DeleteVersionRequest(proto.Message): Required. The name of the version to delete. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` """ name: str = proto.Field( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/webhook.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/webhook.py index a42def87e542..85bab81be29f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/webhook.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/webhook.py @@ -19,7 +19,6 @@ import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2.types import context, intent, session_entity_type from google.cloud.dialogflow_v2.types import session as gcd_session @@ -84,9 +83,9 @@ class WebhookResponse(proto.Message): field. Setting JSON fields to an empty value with the wrong type is a common error. To avoid this error: - - Use ``""`` for empty strings - - Use ``{}`` or ``null`` for empty objects - - Use ``[]`` or ``null`` for empty arrays + - Use ``""`` for empty strings + - Use ``{}`` or ``null`` for empty objects + - Use ``[]`` or ``null`` for empty arrays For more information, see the `Protocol Buffers Language Guide `__. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/__init__.py index cd836430eaab..7e2ce9470d43 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/__init__.py @@ -16,7 +16,6 @@ import sys import google.api_core as api_core - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version __version__ = package_version.__version__ @@ -105,6 +104,8 @@ TelephonyDtmfEvents, VoiceSelectionParams, ) +from .types.ces_app import CesAppSpec +from .types.ces_tool import CesToolSpec from .types.context import ( Context, CreateContextRequest, @@ -136,6 +137,7 @@ ListMessagesRequest, ListMessagesResponse, SearchKnowledgeAnswer, + SearchKnowledgeDebugInfo, SearchKnowledgeRequest, SearchKnowledgeResponse, SuggestConversationSummaryRequest, @@ -290,15 +292,18 @@ CompileSuggestionRequest, CompileSuggestionResponse, CreateParticipantRequest, + DatastoreResponseReason, DialogflowAssistAnswer, DtmfParameters, FaqAnswer, GenerateSuggestionsResponse, GetParticipantRequest, + IngestedContextReferenceDebugInfo, InputTextConfig, IntentInput, IntentSuggestion, KnowledgeAssistAnswer, + KnowledgeAssistDebugInfo, ListParticipantsRequest, ListParticipantsResponse, ListSuggestionsRequest, @@ -308,6 +313,7 @@ OutputAudio, Participant, ResponseMessage, + ServiceLatency, SmartReplyAnswer, StreamingAnalyzeContentRequest, StreamingAnalyzeContentResponse, @@ -380,6 +386,7 @@ UpdateToolRequest, ) from .types.tool_call import ToolCall, ToolCallResult +from .types.toolset import ToolsetTool from .types.validation_result import ValidationError, ValidationResult from .types.version import ( CreateVersionRequest, @@ -541,6 +548,8 @@ def _get_version(dependency_name): "BatchUpdateIntentsResponse", "BidiStreamingAnalyzeContentRequest", "BidiStreamingAnalyzeContentResponse", + "CesAppSpec", + "CesToolSpec", "ClearSuggestionFeatureConfigOperationMetadata", "ClearSuggestionFeatureConfigRequest", "CloudConversationDebuggingInfo", @@ -574,6 +583,7 @@ def _get_version(dependency_name): "CreateToolRequest", "CreateVersionRequest", "CustomPronunciationParams", + "DatastoreResponseReason", "DeleteAgentRequest", "DeleteAllContextsRequest", "DeleteContextRequest", @@ -662,6 +672,7 @@ def _get_version(dependency_name): "InferenceParameter", "IngestContextReferencesRequest", "IngestContextReferencesResponse", + "IngestedContextReferenceDebugInfo", "InitializeEncryptionSpecMetadata", "InitializeEncryptionSpecRequest", "InitializeEncryptionSpecResponse", @@ -675,6 +686,7 @@ def _get_version(dependency_name): "IntentsClient", "KnowledgeAnswers", "KnowledgeAssistAnswer", + "KnowledgeAssistDebugInfo", "KnowledgeBase", "KnowledgeBasesClient", "KnowledgeOperationMetadata", @@ -739,11 +751,13 @@ def _get_version(dependency_name): "SearchAgentsRequest", "SearchAgentsResponse", "SearchKnowledgeAnswer", + "SearchKnowledgeDebugInfo", "SearchKnowledgeRequest", "SearchKnowledgeResponse", "Sentiment", "SentimentAnalysisRequestConfig", "SentimentAnalysisResult", + "ServiceLatency", "SessionEntityType", "SessionEntityTypesClient", "SessionsClient", @@ -794,6 +808,7 @@ def _get_version(dependency_name): "ToolCall", "ToolCallResult", "ToolsClient", + "ToolsetTool", "TrainAgentRequest", "TriggerEvent", "UndeletePhoneNumberRequest", diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/async_client.py index 6e502e3c1127..23a67d370f3b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -48,12 +47,11 @@ import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.agents import pagers from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import AgentsClient from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport @@ -85,18 +83,18 @@ class AgentsAsyncClient: agent_path = staticmethod(AgentsClient.agent_path) parse_agent_path = staticmethod(AgentsClient.parse_agent_path) - common_billing_account_path = staticmethod(AgentsClient.common_billing_account_path) - parse_common_billing_account_path = staticmethod( - AgentsClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(AgentsClient.common_folder_path) - parse_common_folder_path = staticmethod(AgentsClient.parse_common_folder_path) + common_project_path = staticmethod(AgentsClient.common_project_path) + parse_common_project_path = staticmethod(AgentsClient.parse_common_project_path) common_organization_path = staticmethod(AgentsClient.common_organization_path) parse_common_organization_path = staticmethod( AgentsClient.parse_common_organization_path ) - common_project_path = staticmethod(AgentsClient.common_project_path) - parse_common_project_path = staticmethod(AgentsClient.parse_common_project_path) + common_folder_path = staticmethod(AgentsClient.common_folder_path) + parse_common_folder_path = staticmethod(AgentsClient.parse_common_folder_path) + common_billing_account_path = staticmethod(AgentsClient.common_billing_account_path) + parse_common_billing_account_path = staticmethod( + AgentsClient.parse_common_billing_account_path + ) common_location_path = staticmethod(AgentsClient.common_location_path) parse_common_location_path = staticmethod(AgentsClient.parse_common_location_path) @@ -789,10 +787,10 @@ async def train_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -819,11 +817,11 @@ async def sample_train_agent(): ) # Make the request - operation = client.train_agent(request=request) + operation = await client.train_agent(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -937,10 +935,10 @@ async def export_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [ExportAgentResponse][google.cloud.dialogflow.v2beta1.ExportAgentResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [ExportAgentResponse][google.cloud.dialogflow.v2beta1.ExportAgentResponse] .. code-block:: python @@ -963,11 +961,11 @@ async def sample_export_agent(): ) # Make the request - operation = client.export_agent(request=request) + operation = await client.export_agent(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1084,10 +1082,10 @@ async def import_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ The operation only tracks when importing is complete, not when it is done training. @@ -1118,11 +1116,11 @@ async def sample_import_agent(): ) # Make the request - operation = client.import_agent(request=request) + operation = await client.import_agent(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1220,10 +1218,10 @@ async def restore_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ The operation only tracks when restoring is complete, not when it is done training. @@ -1254,11 +1252,11 @@ async def sample_restore_agent(): ) # Make the request - operation = client.restore_agent(request=request) + operation = await client.restore_agent(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/client.py index ea491d3b27ab..42fcbe012e9d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -65,12 +64,11 @@ import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.agents import pagers from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport from .transports.grpc import AgentsGrpcTransport @@ -1211,10 +1209,10 @@ def train_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -1356,10 +1354,10 @@ def export_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [ExportAgentResponse][google.cloud.dialogflow.v2beta1.ExportAgentResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [ExportAgentResponse][google.cloud.dialogflow.v2beta1.ExportAgentResponse] .. code-block:: python @@ -1500,10 +1498,10 @@ def import_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ The operation only tracks when importing is complete, not when it is done training. @@ -1634,10 +1632,10 @@ def restore_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ The operation only tracks when restoring is complete, not when it is done training. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/base.py index 8bcd409f44b0..9f471ca722bd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/base.py @@ -24,13 +24,12 @@ from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc.py index e56d94eed1e5..a6a9ee282f26 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc.py @@ -27,13 +27,12 @@ from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2beta1.types import agent, validation_result +from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2beta1.types import agent, validation_result -from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent - from .base import DEFAULT_CLIENT_INFO, AgentsTransport try: @@ -467,10 +466,10 @@ def train_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -507,10 +506,10 @@ def export_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [ExportAgentResponse][google.cloud.dialogflow.v2beta1.ExportAgentResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [ExportAgentResponse][google.cloud.dialogflow.v2beta1.ExportAgentResponse] Returns: Callable[[~.ExportAgentRequest], @@ -555,10 +554,10 @@ def import_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ The operation only tracks when importing is complete, not when it is done training. @@ -608,10 +607,10 @@ def restore_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ The operation only tracks when restoring is complete, not when it is done training. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc_asyncio.py index ca53eae1bc74..03f93c1de45a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc_asyncio.py @@ -29,14 +29,13 @@ 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.dialogflow_v2beta1.types import agent, validation_result +from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2beta1.types import agent, validation_result -from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent - from .base import DEFAULT_CLIENT_INFO, AgentsTransport from .grpc import AgentsGrpcTransport @@ -479,10 +478,10 @@ def train_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -519,10 +518,10 @@ def export_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [ExportAgentResponse][google.cloud.dialogflow.v2beta1.ExportAgentResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [ExportAgentResponse][google.cloud.dialogflow.v2beta1.ExportAgentResponse] Returns: Callable[[~.ExportAgentRequest], @@ -567,10 +566,10 @@ def import_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ The operation only tracks when importing is complete, not when it is done training. @@ -620,10 +619,10 @@ def restore_agent( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ The operation only tracks when restoring is complete, not when it is done training. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest.py index ada3b440d2c0..c2d704f9abf0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest.py @@ -26,14 +26,13 @@ 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.dialogflow_v2beta1.types import agent, validation_result +from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import agent, validation_result -from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAgentsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest_base.py index 367e640e996d..727a33968874 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest_base.py @@ -19,13 +19,12 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2beta1.types import agent, validation_result +from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent 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.dialogflow_v2beta1.types import agent, validation_result -from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent - from .base import DEFAULT_CLIENT_INFO, AgentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/async_client.py index 43508ed49a9d..93028e3816af 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/async_client.py @@ -36,9 +36,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,12 +45,11 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.answer_records import pagers from google.cloud.dialogflow_v2beta1.types import answer_record from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import AnswerRecordsClient from .transports.base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport @@ -81,6 +79,12 @@ class AnswerRecordsAsyncClient: _DEFAULT_ENDPOINT_TEMPLATE = AnswerRecordsClient._DEFAULT_ENDPOINT_TEMPLATE _DEFAULT_UNIVERSE = AnswerRecordsClient._DEFAULT_UNIVERSE + app_path = staticmethod(AnswerRecordsClient.app_path) + parse_app_path = staticmethod(AnswerRecordsClient.parse_app_path) + ces_tool_path = staticmethod(AnswerRecordsClient.ces_tool_path) + parse_ces_tool_path = staticmethod(AnswerRecordsClient.parse_ces_tool_path) + toolset_path = staticmethod(AnswerRecordsClient.toolset_path) + parse_toolset_path = staticmethod(AnswerRecordsClient.parse_toolset_path) answer_record_path = staticmethod(AnswerRecordsClient.answer_record_path) parse_answer_record_path = staticmethod( AnswerRecordsClient.parse_answer_record_path @@ -93,15 +97,9 @@ class AnswerRecordsAsyncClient: parse_intent_path = staticmethod(AnswerRecordsClient.parse_intent_path) tool_path = staticmethod(AnswerRecordsClient.tool_path) parse_tool_path = staticmethod(AnswerRecordsClient.parse_tool_path) - common_billing_account_path = staticmethod( - AnswerRecordsClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - AnswerRecordsClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(AnswerRecordsClient.common_folder_path) - parse_common_folder_path = staticmethod( - AnswerRecordsClient.parse_common_folder_path + common_project_path = staticmethod(AnswerRecordsClient.common_project_path) + parse_common_project_path = staticmethod( + AnswerRecordsClient.parse_common_project_path ) common_organization_path = staticmethod( AnswerRecordsClient.common_organization_path @@ -109,9 +107,15 @@ class AnswerRecordsAsyncClient: parse_common_organization_path = staticmethod( AnswerRecordsClient.parse_common_organization_path ) - common_project_path = staticmethod(AnswerRecordsClient.common_project_path) - parse_common_project_path = staticmethod( - AnswerRecordsClient.parse_common_project_path + common_folder_path = staticmethod(AnswerRecordsClient.common_folder_path) + parse_common_folder_path = staticmethod( + AnswerRecordsClient.parse_common_folder_path + ) + common_billing_account_path = staticmethod( + AnswerRecordsClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + AnswerRecordsClient.parse_common_billing_account_path ) common_location_path = staticmethod(AnswerRecordsClient.common_location_path) parse_common_location_path = staticmethod( @@ -366,13 +370,13 @@ async def sample_get_answer_record(): Currently, answer record includes: - - human agent assistant article suggestion - - human agent assistant faq article + - human agent assistant article suggestion + - human agent assistant faq article It doesn't include: - - DetectIntent intent matching - - DetectIntent knowledge + - DetectIntent intent matching + - DetectIntent knowledge Answer records are not related to the conversation history in the Dialogflow Console. A Record is @@ -631,13 +635,13 @@ async def sample_update_answer_record(): Currently, answer record includes: - - human agent assistant article suggestion - - human agent assistant faq article + - human agent assistant article suggestion + - human agent assistant faq article It doesn't include: - - DetectIntent intent matching - - DetectIntent knowledge + - DetectIntent intent matching + - DetectIntent knowledge Answer records are not related to the conversation history in the Dialogflow Console. A Record is diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/client.py index ff8fbd219e65..6981b60e9f02 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -62,12 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.answer_records import pagers from google.cloud.dialogflow_v2beta1.types import answer_record from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport from .transports.grpc import AnswerRecordsGrpcTransport @@ -233,6 +231,76 @@ def transport(self) -> AnswerRecordsTransport: """ return self._transport + @staticmethod + def app_path( + project: str, + location: str, + app: str, + ) -> str: + """Returns a fully-qualified app string.""" + return "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + + @staticmethod + def parse_app_path(path: str) -> Dict[str, str]: + """Parses a app path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def ces_tool_path( + project: str, + location: str, + app: str, + tool: str, + ) -> str: + """Returns a fully-qualified ces_tool string.""" + return "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + + @staticmethod + def parse_ces_tool_path(path: str) -> Dict[str, str]: + """Parses a ces_tool path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/tools/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def toolset_path( + project: str, + location: str, + app: str, + toolset: str, + ) -> str: + """Returns a fully-qualified toolset string.""" + return "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + + @staticmethod + def parse_toolset_path(path: str) -> Dict[str, str]: + """Parses a toolset path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/toolsets/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def answer_record_path( project: str, @@ -869,13 +937,13 @@ def sample_get_answer_record(): Currently, answer record includes: - - human agent assistant article suggestion - - human agent assistant faq article + - human agent assistant article suggestion + - human agent assistant faq article It doesn't include: - - DetectIntent intent matching - - DetectIntent knowledge + - DetectIntent intent matching + - DetectIntent knowledge Answer records are not related to the conversation history in the Dialogflow Console. A Record is @@ -1128,13 +1196,13 @@ def sample_update_answer_record(): Currently, answer record includes: - - human agent assistant article suggestion - - human agent assistant faq article + - human agent assistant article suggestion + - human agent assistant faq article It doesn't include: - - DetectIntent intent matching - - DetectIntent knowledge + - DetectIntent intent matching + - DetectIntent knowledge Answer records are not related to the conversation history in the Dialogflow Console. A Record is diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/base.py index ce61c173af02..8fe9fade22da 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/base.py @@ -23,13 +23,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import answer_record from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc.py index 90fd6989653b..0c3c22870ebd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc.py @@ -26,13 +26,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2beta1.types import answer_record +from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2beta1.types import answer_record -from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record - from .base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc_asyncio.py index 7a2b8fce3bda..a588f772fac2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc_asyncio.py @@ -28,14 +28,13 @@ 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.dialogflow_v2beta1.types import answer_record +from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2beta1.types import answer_record -from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record - from .base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport from .grpc import AnswerRecordsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest.py index facc69245cc3..8bbf4999c781 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest.py @@ -25,14 +25,13 @@ 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.dialogflow_v2beta1.types import answer_record +from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import answer_record -from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAnswerRecordsRestTransport @@ -527,13 +526,13 @@ def __call__( Currently, answer record includes: - - human agent assistant article suggestion - - human agent assistant faq article + - human agent assistant article suggestion + - human agent assistant faq article It doesn't include: - - ``DetectIntent`` intent matching - - ``DetectIntent`` knowledge + - ``DetectIntent`` intent matching + - ``DetectIntent`` knowledge Answer records are not related to the conversation history in the Dialogflow Console. A Record is generated @@ -855,13 +854,13 @@ def __call__( Currently, answer record includes: - - human agent assistant article suggestion - - human agent assistant faq article + - human agent assistant article suggestion + - human agent assistant faq article It doesn't include: - - ``DetectIntent`` intent matching - - ``DetectIntent`` knowledge + - ``DetectIntent`` intent matching + - ``DetectIntent`` knowledge Answer records are not related to the conversation history in the Dialogflow Console. A Record is generated diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest_base.py index fa10c68a1314..f32ede9cb963 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest_base.py @@ -18,13 +18,12 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2beta1.types import answer_record +from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record 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.dialogflow_v2beta1.types import answer_record -from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record - from .base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/async_client.py index a1505ea655a8..a5cd3321c38b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,12 +45,11 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.contexts import pagers from google.cloud.dialogflow_v2beta1.types import context from google.cloud.dialogflow_v2beta1.types import context as gcd_context +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import ContextsClient from .transports.base import DEFAULT_CLIENT_INFO, ContextsTransport @@ -83,20 +81,20 @@ class ContextsAsyncClient: context_path = staticmethod(ContextsClient.context_path) parse_context_path = staticmethod(ContextsClient.parse_context_path) + common_project_path = staticmethod(ContextsClient.common_project_path) + parse_common_project_path = staticmethod(ContextsClient.parse_common_project_path) + common_organization_path = staticmethod(ContextsClient.common_organization_path) + parse_common_organization_path = staticmethod( + ContextsClient.parse_common_organization_path + ) + common_folder_path = staticmethod(ContextsClient.common_folder_path) + parse_common_folder_path = staticmethod(ContextsClient.parse_common_folder_path) common_billing_account_path = staticmethod( ContextsClient.common_billing_account_path ) parse_common_billing_account_path = staticmethod( ContextsClient.parse_common_billing_account_path ) - common_folder_path = staticmethod(ContextsClient.common_folder_path) - parse_common_folder_path = staticmethod(ContextsClient.parse_common_folder_path) - common_organization_path = staticmethod(ContextsClient.common_organization_path) - parse_common_organization_path = staticmethod( - ContextsClient.parse_common_organization_path - ) - common_project_path = staticmethod(ContextsClient.common_project_path) - parse_common_project_path = staticmethod(ContextsClient.parse_common_project_path) common_location_path = staticmethod(ContextsClient.common_location_path) parse_common_location_path = staticmethod(ContextsClient.parse_common_location_path) @@ -340,10 +338,10 @@ async def sample_list_contexts(): Required. The session to list all contexts from. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, @@ -474,10 +472,10 @@ async def sample_get_context(): name (:class:`str`): Required. The name of the context. Supported formats: - - ``projects//agent/sessions//contexts/``, - - ``projects//locations//agent/sessions//contexts/``, - - ``projects//agent/environments//users//sessions//contexts/``, - - ``projects//locations//agent/environments//users//sessions//contexts/``, + - ``projects//agent/sessions//contexts/``, + - ``projects//locations//agent/sessions//contexts/``, + - ``projects//agent/environments//users//sessions//contexts/``, + - ``projects//locations//agent/environments//users//sessions//contexts/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, @@ -616,10 +614,10 @@ async def sample_create_context(): Required. The session to create a context for. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, @@ -895,10 +893,10 @@ async def sample_delete_context(): Required. The name of the context to delete. Supported formats: - - ``projects//agent/sessions//contexts/``, - - ``projects//locations//agent/sessions//contexts/``, - - ``projects//agent/environments//users//sessions//contexts/``, - - ``projects//locations//agent/environments//users//sessions//contexts/``, + - ``projects//agent/sessions//contexts/``, + - ``projects//locations//agent/sessions//contexts/``, + - ``projects//agent/environments//users//sessions//contexts/``, + - ``projects//locations//agent/environments//users//sessions//contexts/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, @@ -1004,10 +1002,10 @@ async def sample_delete_all_contexts(): Required. The name of the session to delete all contexts from. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified we diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/client.py index 285e5500e6ba..7ddf660d85d1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -63,12 +62,11 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.contexts import pagers from google.cloud.dialogflow_v2beta1.types import context from google.cloud.dialogflow_v2beta1.types import context as gcd_context +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, ContextsTransport from .transports.grpc import ContextsGrpcTransport @@ -779,10 +777,10 @@ def sample_list_contexts(): Required. The session to list all contexts from. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, @@ -910,10 +908,10 @@ def sample_get_context(): name (str): Required. The name of the context. Supported formats: - - ``projects//agent/sessions//contexts/``, - - ``projects//locations//agent/sessions//contexts/``, - - ``projects//agent/environments//users//sessions//contexts/``, - - ``projects//locations//agent/environments//users//sessions//contexts/``, + - ``projects//agent/sessions//contexts/``, + - ``projects//locations//agent/sessions//contexts/``, + - ``projects//agent/environments//users//sessions//contexts/``, + - ``projects//locations//agent/environments//users//sessions//contexts/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, @@ -1049,10 +1047,10 @@ def sample_create_context(): Required. The session to create a context for. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, @@ -1322,10 +1320,10 @@ def sample_delete_context(): Required. The name of the context to delete. Supported formats: - - ``projects//agent/sessions//contexts/``, - - ``projects//locations//agent/sessions//contexts/``, - - ``projects//agent/environments//users//sessions//contexts/``, - - ``projects//locations//agent/environments//users//sessions//contexts/``, + - ``projects//agent/sessions//contexts/``, + - ``projects//locations//agent/sessions//contexts/``, + - ``projects//agent/environments//users//sessions//contexts/``, + - ``projects//locations//agent/environments//users//sessions//contexts/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, @@ -1428,10 +1426,10 @@ def sample_delete_all_contexts(): Required. The name of the session to delete all contexts from. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified we diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/base.py index 9c9250d75e25..90f0aa90bb35 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/base.py @@ -24,13 +24,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import context from google.cloud.dialogflow_v2beta1.types import context as gcd_context +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc.py index 098c913d7b8c..72bd0fd3f97b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc.py @@ -27,13 +27,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2beta1.types import context +from google.cloud.dialogflow_v2beta1.types import context as gcd_context from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2beta1.types import context -from google.cloud.dialogflow_v2beta1.types import context as gcd_context - from .base import DEFAULT_CLIENT_INFO, ContextsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc_asyncio.py index f3074af10285..0bd55d0f7257 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc_asyncio.py @@ -29,14 +29,13 @@ 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.dialogflow_v2beta1.types import context +from google.cloud.dialogflow_v2beta1.types import context as gcd_context from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2beta1.types import context -from google.cloud.dialogflow_v2beta1.types import context as gcd_context - from .base import DEFAULT_CLIENT_INFO, ContextsTransport from .grpc import ContextsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest.py index b98f1ad3ad8d..4580a3498c9b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest.py @@ -26,14 +26,13 @@ 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.dialogflow_v2beta1.types import context +from google.cloud.dialogflow_v2beta1.types import context as gcd_context from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import context -from google.cloud.dialogflow_v2beta1.types import context as gcd_context - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseContextsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest_base.py index 188ed4abb3e6..8367cea99549 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest_base.py @@ -19,13 +19,12 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2beta1.types import context +from google.cloud.dialogflow_v2beta1.types import context as gcd_context 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.dialogflow_v2beta1.types import context -from google.cloud.dialogflow_v2beta1.types import context as gcd_context - from .base import DEFAULT_CLIENT_INFO, ContextsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/async_client.py index effff9497144..65792a3aca20 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -48,9 +47,6 @@ import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.conversation_profiles import pagers from google.cloud.dialogflow_v2beta1.types import ( audio_config, @@ -60,6 +56,8 @@ from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import ConversationProfilesClient from .transports.base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport @@ -91,6 +89,12 @@ class ConversationProfilesAsyncClient: agent_path = staticmethod(ConversationProfilesClient.agent_path) parse_agent_path = staticmethod(ConversationProfilesClient.parse_agent_path) + cx_security_settings_path = staticmethod( + ConversationProfilesClient.cx_security_settings_path + ) + parse_cx_security_settings_path = staticmethod( + ConversationProfilesClient.parse_cx_security_settings_path + ) conversation_model_path = staticmethod( ConversationProfilesClient.conversation_model_path ) @@ -103,12 +107,6 @@ class ConversationProfilesAsyncClient: parse_conversation_profile_path = staticmethod( ConversationProfilesClient.parse_conversation_profile_path ) - cx_security_settings_path = staticmethod( - ConversationProfilesClient.cx_security_settings_path - ) - parse_cx_security_settings_path = staticmethod( - ConversationProfilesClient.parse_cx_security_settings_path - ) document_path = staticmethod(ConversationProfilesClient.document_path) parse_document_path = staticmethod(ConversationProfilesClient.parse_document_path) generator_path = staticmethod(ConversationProfilesClient.generator_path) @@ -121,15 +119,9 @@ class ConversationProfilesAsyncClient: parse_phrase_set_path = staticmethod( ConversationProfilesClient.parse_phrase_set_path ) - common_billing_account_path = staticmethod( - ConversationProfilesClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - ConversationProfilesClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(ConversationProfilesClient.common_folder_path) - parse_common_folder_path = staticmethod( - ConversationProfilesClient.parse_common_folder_path + common_project_path = staticmethod(ConversationProfilesClient.common_project_path) + parse_common_project_path = staticmethod( + ConversationProfilesClient.parse_common_project_path ) common_organization_path = staticmethod( ConversationProfilesClient.common_organization_path @@ -137,9 +129,15 @@ class ConversationProfilesAsyncClient: parse_common_organization_path = staticmethod( ConversationProfilesClient.parse_common_organization_path ) - common_project_path = staticmethod(ConversationProfilesClient.common_project_path) - parse_common_project_path = staticmethod( - ConversationProfilesClient.parse_common_project_path + common_folder_path = staticmethod(ConversationProfilesClient.common_folder_path) + parse_common_folder_path = staticmethod( + ConversationProfilesClient.parse_common_folder_path + ) + common_billing_account_path = staticmethod( + ConversationProfilesClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + ConversationProfilesClient.parse_common_billing_account_path ) common_location_path = staticmethod(ConversationProfilesClient.common_location_path) parse_common_location_path = staticmethod( @@ -999,10 +997,10 @@ async def set_suggestion_feature_config( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2beta1.SetSuggestionFeatureConfigOperationMetadata] - - ``response``: - [ConversationProfile][google.cloud.dialogflow.v2beta1.ConversationProfile] + - ``metadata``: + [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2beta1.SetSuggestionFeatureConfigOperationMetadata] + - ``response``: + [ConversationProfile][google.cloud.dialogflow.v2beta1.ConversationProfile] If a long running operation to add or update suggestion feature config for the same conversation profile, participant role and @@ -1032,11 +1030,11 @@ async def sample_set_suggestion_feature_config(): ) # Make the request - operation = client.set_suggestion_feature_config(request=request) + operation = await client.set_suggestion_feature_config(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1178,10 +1176,10 @@ async def clear_suggestion_feature_config( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2beta1.ClearSuggestionFeatureConfigOperationMetadata] - - ``response``: - [ConversationProfile][google.cloud.dialogflow.v2beta1.ConversationProfile] + - ``metadata``: + [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2beta1.ClearSuggestionFeatureConfigOperationMetadata] + - ``response``: + [ConversationProfile][google.cloud.dialogflow.v2beta1.ConversationProfile] .. code-block:: python @@ -1206,11 +1204,11 @@ async def sample_clear_suggestion_feature_config(): ) # Make the request - operation = client.clear_suggestion_feature_config(request=request) + operation = await client.clear_suggestion_feature_config(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/client.py index 7b451338308e..880aa0d096d3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -65,9 +64,6 @@ import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.conversation_profiles import pagers from google.cloud.dialogflow_v2beta1.types import ( audio_config, @@ -77,6 +73,8 @@ from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport from .transports.grpc import ConversationProfilesGrpcTransport @@ -257,6 +255,28 @@ def parse_agent_path(path: str) -> Dict[str, str]: m = re.match(r"^projects/(?P.+?)/agent$", path) return m.groupdict() if m else {} + @staticmethod + def cx_security_settings_path( + project: str, + location: str, + security_settings: str, + ) -> str: + """Returns a fully-qualified cx_security_settings string.""" + return "projects/{project}/locations/{location}/securitySettings/{security_settings}".format( + project=project, + location=location, + security_settings=security_settings, + ) + + @staticmethod + def parse_cx_security_settings_path(path: str) -> Dict[str, str]: + """Parses a cx_security_settings path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/securitySettings/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def conversation_model_path( project: str, @@ -299,28 +319,6 @@ def parse_conversation_profile_path(path: str) -> Dict[str, str]: ) return m.groupdict() if m else {} - @staticmethod - def cx_security_settings_path( - project: str, - location: str, - security_settings: str, - ) -> str: - """Returns a fully-qualified cx_security_settings string.""" - return "projects/{project}/locations/{location}/securitySettings/{security_settings}".format( - project=project, - location=location, - security_settings=security_settings, - ) - - @staticmethod - def parse_cx_security_settings_path(path: str) -> Dict[str, str]: - """Parses a cx_security_settings path into its component segments.""" - m = re.match( - r"^projects/(?P.+?)/locations/(?P.+?)/securitySettings/(?P.+?)$", - path, - ) - return m.groupdict() if m else {} - @staticmethod def document_path( project: str, @@ -1537,10 +1535,10 @@ def set_suggestion_feature_config( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2beta1.SetSuggestionFeatureConfigOperationMetadata] - - ``response``: - [ConversationProfile][google.cloud.dialogflow.v2beta1.ConversationProfile] + - ``metadata``: + [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2beta1.SetSuggestionFeatureConfigOperationMetadata] + - ``response``: + [ConversationProfile][google.cloud.dialogflow.v2beta1.ConversationProfile] If a long running operation to add or update suggestion feature config for the same conversation profile, participant role and @@ -1715,10 +1713,10 @@ def clear_suggestion_feature_config( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2beta1.ClearSuggestionFeatureConfigOperationMetadata] - - ``response``: - [ConversationProfile][google.cloud.dialogflow.v2beta1.ConversationProfile] + - ``metadata``: + [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2beta1.ClearSuggestionFeatureConfigOperationMetadata] + - ``response``: + [ConversationProfile][google.cloud.dialogflow.v2beta1.ConversationProfile] .. code-block:: python diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/base.py index 9d2830caa435..e22e7bbdc8b7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/base.py @@ -24,15 +24,14 @@ from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import conversation_profile from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc.py index 3400f4dda2a7..ae7f72f538f2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc.py @@ -27,14 +27,13 @@ from google.api_core import gapic_v1, grpc_helpers, 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 - from google.cloud.dialogflow_v2beta1.types import conversation_profile from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from .base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport @@ -533,10 +532,10 @@ def set_suggestion_feature_config( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2beta1.SetSuggestionFeatureConfigOperationMetadata] - - ``response``: - [ConversationProfile][google.cloud.dialogflow.v2beta1.ConversationProfile] + - ``metadata``: + [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2beta1.SetSuggestionFeatureConfigOperationMetadata] + - ``response``: + [ConversationProfile][google.cloud.dialogflow.v2beta1.ConversationProfile] If a long running operation to add or update suggestion feature config for the same conversation profile, participant role and @@ -582,10 +581,10 @@ def clear_suggestion_feature_config( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2beta1.ClearSuggestionFeatureConfigOperationMetadata] - - ``response``: - [ConversationProfile][google.cloud.dialogflow.v2beta1.ConversationProfile] + - ``metadata``: + [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2beta1.ClearSuggestionFeatureConfigOperationMetadata] + - ``response``: + [ConversationProfile][google.cloud.dialogflow.v2beta1.ConversationProfile] Returns: Callable[[~.ClearSuggestionFeatureConfigRequest], diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc_asyncio.py index 6599e5da6f2a..4bbf7adb28ab 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc_asyncio.py @@ -29,15 +29,14 @@ 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 -from grpc.experimental import aio # type: ignore - from google.cloud.dialogflow_v2beta1.types import conversation_profile from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from grpc.experimental import aio # type: ignore from .base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport from .grpc import ConversationProfilesGrpcTransport @@ -542,10 +541,10 @@ def set_suggestion_feature_config( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2beta1.SetSuggestionFeatureConfigOperationMetadata] - - ``response``: - [ConversationProfile][google.cloud.dialogflow.v2beta1.ConversationProfile] + - ``metadata``: + [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2beta1.SetSuggestionFeatureConfigOperationMetadata] + - ``response``: + [ConversationProfile][google.cloud.dialogflow.v2beta1.ConversationProfile] If a long running operation to add or update suggestion feature config for the same conversation profile, participant role and @@ -591,10 +590,10 @@ def clear_suggestion_feature_config( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2beta1.ClearSuggestionFeatureConfigOperationMetadata] - - ``response``: - [ConversationProfile][google.cloud.dialogflow.v2beta1.ConversationProfile] + - ``metadata``: + [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2beta1.ClearSuggestionFeatureConfigOperationMetadata] + - ``response``: + [ConversationProfile][google.cloud.dialogflow.v2beta1.ConversationProfile] Returns: Callable[[~.ClearSuggestionFeatureConfigRequest], diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest.py index 4f67567cafe9..a0023f8a09b5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest.py @@ -26,15 +26,14 @@ 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.protobuf import json_format -from requests import __version__ as requests_version - from google.cloud.dialogflow_v2beta1.types import conversation_profile from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import json_format +from requests import __version__ as requests_version from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationProfilesRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest_base.py index 7dbc37993b77..1699be9ca738 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest_base.py @@ -19,14 +19,13 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore 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.dialogflow_v2beta1.types import conversation_profile from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import json_format from .base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/async_client.py index 440358830bd0..0f136c238475 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -45,12 +44,16 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.conversations import pagers -from google.cloud.dialogflow_v2beta1.types import conversation, generator, participant +from google.cloud.dialogflow_v2beta1.types import ( + conversation, + conversation_profile, + generator, + participant, +) from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import ConversationsClient from .transports.base import DEFAULT_CLIENT_INFO, ConversationsTransport @@ -80,12 +83,24 @@ class ConversationsAsyncClient: _DEFAULT_ENDPOINT_TEMPLATE = ConversationsClient._DEFAULT_ENDPOINT_TEMPLATE _DEFAULT_UNIVERSE = ConversationsClient._DEFAULT_UNIVERSE + app_path = staticmethod(ConversationsClient.app_path) + parse_app_path = staticmethod(ConversationsClient.parse_app_path) + ces_tool_path = staticmethod(ConversationsClient.ces_tool_path) + parse_ces_tool_path = staticmethod(ConversationsClient.parse_ces_tool_path) + toolset_path = staticmethod(ConversationsClient.toolset_path) + parse_toolset_path = staticmethod(ConversationsClient.parse_toolset_path) agent_path = staticmethod(ConversationsClient.agent_path) parse_agent_path = staticmethod(ConversationsClient.parse_agent_path) answer_record_path = staticmethod(ConversationsClient.answer_record_path) parse_answer_record_path = staticmethod( ConversationsClient.parse_answer_record_path ) + cx_security_settings_path = staticmethod( + ConversationsClient.cx_security_settings_path + ) + parse_cx_security_settings_path = staticmethod( + ConversationsClient.parse_cx_security_settings_path + ) conversation_path = staticmethod(ConversationsClient.conversation_path) parse_conversation_path = staticmethod(ConversationsClient.parse_conversation_path) conversation_model_path = staticmethod(ConversationsClient.conversation_model_path) @@ -98,14 +113,6 @@ class ConversationsAsyncClient: parse_conversation_profile_path = staticmethod( ConversationsClient.parse_conversation_profile_path ) - cx_security_settings_path = staticmethod( - ConversationsClient.cx_security_settings_path - ) - parse_cx_security_settings_path = staticmethod( - ConversationsClient.parse_cx_security_settings_path - ) - data_store_path = staticmethod(ConversationsClient.data_store_path) - parse_data_store_path = staticmethod(ConversationsClient.parse_data_store_path) document_path = staticmethod(ConversationsClient.document_path) parse_document_path = staticmethod(ConversationsClient.parse_document_path) generator_path = staticmethod(ConversationsClient.generator_path) @@ -116,19 +123,15 @@ class ConversationsAsyncClient: ) message_path = staticmethod(ConversationsClient.message_path) parse_message_path = staticmethod(ConversationsClient.parse_message_path) - phrase_set_path = staticmethod(ConversationsClient.phrase_set_path) - parse_phrase_set_path = staticmethod(ConversationsClient.parse_phrase_set_path) tool_path = staticmethod(ConversationsClient.tool_path) parse_tool_path = staticmethod(ConversationsClient.parse_tool_path) - common_billing_account_path = staticmethod( - ConversationsClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - ConversationsClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(ConversationsClient.common_folder_path) - parse_common_folder_path = staticmethod( - ConversationsClient.parse_common_folder_path + data_store_path = staticmethod(ConversationsClient.data_store_path) + parse_data_store_path = staticmethod(ConversationsClient.parse_data_store_path) + phrase_set_path = staticmethod(ConversationsClient.phrase_set_path) + parse_phrase_set_path = staticmethod(ConversationsClient.parse_phrase_set_path) + common_project_path = staticmethod(ConversationsClient.common_project_path) + parse_common_project_path = staticmethod( + ConversationsClient.parse_common_project_path ) common_organization_path = staticmethod( ConversationsClient.common_organization_path @@ -136,9 +139,15 @@ class ConversationsAsyncClient: parse_common_organization_path = staticmethod( ConversationsClient.parse_common_organization_path ) - common_project_path = staticmethod(ConversationsClient.common_project_path) - parse_common_project_path = staticmethod( - ConversationsClient.parse_common_project_path + common_folder_path = staticmethod(ConversationsClient.common_folder_path) + parse_common_folder_path = staticmethod( + ConversationsClient.parse_common_folder_path + ) + common_billing_account_path = staticmethod( + ConversationsClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + ConversationsClient.parse_common_billing_account_path ) common_location_path = staticmethod(ConversationsClient.common_location_path) parse_common_location_path = staticmethod( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/client.py index 296f364ac5c2..3a53293268bd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -62,12 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.conversations import pagers -from google.cloud.dialogflow_v2beta1.types import conversation, generator, participant +from google.cloud.dialogflow_v2beta1.types import ( + conversation, + conversation_profile, + generator, + participant, +) from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, ConversationsTransport from .transports.grpc import ConversationsGrpcTransport @@ -233,6 +236,76 @@ def transport(self) -> ConversationsTransport: """ return self._transport + @staticmethod + def app_path( + project: str, + location: str, + app: str, + ) -> str: + """Returns a fully-qualified app string.""" + return "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + + @staticmethod + def parse_app_path(path: str) -> Dict[str, str]: + """Parses a app path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def ces_tool_path( + project: str, + location: str, + app: str, + tool: str, + ) -> str: + """Returns a fully-qualified ces_tool string.""" + return "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + + @staticmethod + def parse_ces_tool_path(path: str) -> Dict[str, str]: + """Parses a ces_tool path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/tools/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def toolset_path( + project: str, + location: str, + app: str, + toolset: str, + ) -> str: + """Returns a fully-qualified toolset string.""" + return "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + + @staticmethod + def parse_toolset_path(path: str) -> Dict[str, str]: + """Parses a toolset path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/toolsets/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def agent_path( project: str, @@ -267,6 +340,28 @@ def parse_answer_record_path(path: str) -> Dict[str, str]: ) return m.groupdict() if m else {} + @staticmethod + def cx_security_settings_path( + project: str, + location: str, + security_settings: str, + ) -> str: + """Returns a fully-qualified cx_security_settings string.""" + return "projects/{project}/locations/{location}/securitySettings/{security_settings}".format( + project=project, + location=location, + security_settings=security_settings, + ) + + @staticmethod + def parse_cx_security_settings_path(path: str) -> Dict[str, str]: + """Parses a cx_security_settings path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/securitySettings/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def conversation_path( project: str, @@ -328,52 +423,6 @@ def parse_conversation_profile_path(path: str) -> Dict[str, str]: ) return m.groupdict() if m else {} - @staticmethod - def cx_security_settings_path( - project: str, - location: str, - security_settings: str, - ) -> str: - """Returns a fully-qualified cx_security_settings string.""" - return "projects/{project}/locations/{location}/securitySettings/{security_settings}".format( - project=project, - location=location, - security_settings=security_settings, - ) - - @staticmethod - def parse_cx_security_settings_path(path: str) -> Dict[str, str]: - """Parses a cx_security_settings path into its component segments.""" - m = re.match( - r"^projects/(?P.+?)/locations/(?P.+?)/securitySettings/(?P.+?)$", - path, - ) - return m.groupdict() if m else {} - - @staticmethod - def data_store_path( - project: str, - location: str, - collection: str, - data_store: str, - ) -> str: - """Returns a fully-qualified data_store string.""" - return "projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store}".format( - project=project, - location=location, - collection=collection, - data_store=data_store, - ) - - @staticmethod - def parse_data_store_path(path: str) -> Dict[str, str]: - """Parses a data_store path into its component segments.""" - m = re.match( - r"^projects/(?P.+?)/locations/(?P.+?)/collections/(?P.+?)/dataStores/(?P.+?)$", - path, - ) - return m.groupdict() if m else {} - @staticmethod def document_path( project: str, @@ -462,45 +511,69 @@ def parse_message_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def phrase_set_path( + def tool_path( project: str, location: str, - phrase_set: str, + tool: str, ) -> str: - """Returns a fully-qualified phrase_set string.""" - return "projects/{project}/locations/{location}/phraseSets/{phrase_set}".format( + """Returns a fully-qualified tool string.""" + return "projects/{project}/locations/{location}/tools/{tool}".format( project=project, location=location, - phrase_set=phrase_set, + tool=tool, ) @staticmethod - def parse_phrase_set_path(path: str) -> Dict[str, str]: - """Parses a phrase_set path into its component segments.""" + def parse_tool_path(path: str) -> Dict[str, str]: + """Parses a tool path into its component segments.""" m = re.match( - r"^projects/(?P.+?)/locations/(?P.+?)/phraseSets/(?P.+?)$", + r"^projects/(?P.+?)/locations/(?P.+?)/tools/(?P.+?)$", path, ) return m.groupdict() if m else {} @staticmethod - def tool_path( + def data_store_path( project: str, location: str, - tool: str, + collection: str, + data_store: str, ) -> str: - """Returns a fully-qualified tool string.""" - return "projects/{project}/locations/{location}/tools/{tool}".format( + """Returns a fully-qualified data_store string.""" + return "projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store}".format( project=project, location=location, - tool=tool, + collection=collection, + data_store=data_store, ) @staticmethod - def parse_tool_path(path: str) -> Dict[str, str]: - """Parses a tool path into its component segments.""" + def parse_data_store_path(path: str) -> Dict[str, str]: + """Parses a data_store path into its component segments.""" m = re.match( - r"^projects/(?P.+?)/locations/(?P.+?)/tools/(?P.+?)$", + r"^projects/(?P.+?)/locations/(?P.+?)/collections/(?P.+?)/dataStores/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def phrase_set_path( + project: str, + location: str, + phrase_set: str, + ) -> str: + """Returns a fully-qualified phrase_set string.""" + return "projects/{project}/locations/{location}/phraseSets/{phrase_set}".format( + project=project, + location=location, + phrase_set=phrase_set, + ) + + @staticmethod + def parse_phrase_set_path(path: str) -> Dict[str, str]: + """Parses a phrase_set path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/phraseSets/(?P.+?)$", path, ) return m.groupdict() if m else {} diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/base.py index a9e030d39a20..9204141e2f2a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/base.py @@ -23,13 +23,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import conversation, participant from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc.py index 9d6a6730caab..54961b36c7f2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc.py @@ -26,13 +26,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2beta1.types import conversation, participant +from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2beta1.types import conversation, participant -from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation - from .base import DEFAULT_CLIENT_INFO, ConversationsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc_asyncio.py index de086027a59b..4ed5f4902dd5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc_asyncio.py @@ -28,14 +28,13 @@ 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.dialogflow_v2beta1.types import conversation, participant +from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2beta1.types import conversation, participant -from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation - from .base import DEFAULT_CLIENT_INFO, ConversationsTransport from .grpc import ConversationsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest.py index fc86d135dd4b..8c8b1ab76e67 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest.py @@ -25,14 +25,13 @@ 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.dialogflow_v2beta1.types import conversation, participant +from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import conversation, participant -from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest_base.py index 5f6002e25290..eefcb0095857 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest_base.py @@ -18,13 +18,12 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2beta1.types import conversation, participant +from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation 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.dialogflow_v2beta1.types import conversation, participant -from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation - from .base import DEFAULT_CLIENT_INFO, ConversationsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/async_client.py index b40f0ef7bf21..82923d91ca31 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -48,12 +47,11 @@ import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.documents import pagers from google.cloud.dialogflow_v2beta1.types import document, gcs from google.cloud.dialogflow_v2beta1.types import document as gcd_document +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import DocumentsClient from .transports.base import DEFAULT_CLIENT_INFO, DocumentsTransport @@ -85,20 +83,20 @@ class DocumentsAsyncClient: document_path = staticmethod(DocumentsClient.document_path) parse_document_path = staticmethod(DocumentsClient.parse_document_path) + common_project_path = staticmethod(DocumentsClient.common_project_path) + parse_common_project_path = staticmethod(DocumentsClient.parse_common_project_path) + common_organization_path = staticmethod(DocumentsClient.common_organization_path) + parse_common_organization_path = staticmethod( + DocumentsClient.parse_common_organization_path + ) + common_folder_path = staticmethod(DocumentsClient.common_folder_path) + parse_common_folder_path = staticmethod(DocumentsClient.parse_common_folder_path) common_billing_account_path = staticmethod( DocumentsClient.common_billing_account_path ) parse_common_billing_account_path = staticmethod( DocumentsClient.parse_common_billing_account_path ) - common_folder_path = staticmethod(DocumentsClient.common_folder_path) - parse_common_folder_path = staticmethod(DocumentsClient.parse_common_folder_path) - common_organization_path = staticmethod(DocumentsClient.common_organization_path) - parse_common_organization_path = staticmethod( - DocumentsClient.parse_common_organization_path - ) - common_project_path = staticmethod(DocumentsClient.common_project_path) - parse_common_project_path = staticmethod(DocumentsClient.parse_common_project_path) common_location_path = staticmethod(DocumentsClient.common_location_path) parse_common_location_path = staticmethod( DocumentsClient.parse_common_location_path @@ -565,10 +563,10 @@ async def create_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: - [Document][google.cloud.dialogflow.v2beta1.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: + [Document][google.cloud.dialogflow.v2beta1.Document] Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. @@ -601,11 +599,11 @@ async def sample_create_document(): ) # Make the request - operation = client.create_document(request=request) + operation = await client.create_document(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -726,10 +724,10 @@ async def import_documents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: - [ImportDocumentsResponse][google.cloud.dialogflow.v2beta1.ImportDocumentsResponse] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: + [ImportDocumentsResponse][google.cloud.dialogflow.v2beta1.ImportDocumentsResponse] .. code-block:: python @@ -761,11 +759,11 @@ async def sample_import_documents(): ) # Make the request - operation = client.import_documents(request=request) + operation = await client.import_documents(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -846,10 +844,10 @@ async def delete_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: An `Empty + message `__ Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. @@ -875,11 +873,11 @@ async def sample_delete_document(): ) # Make the request - operation = client.delete_document(request=request) + operation = await client.delete_document(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -993,10 +991,10 @@ async def update_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: - [Document][google.cloud.dialogflow.v2beta1.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: + [Document][google.cloud.dialogflow.v2beta1.Document] Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. @@ -1028,11 +1026,11 @@ async def sample_update_document(): ) # Make the request - operation = client.update_document(request=request) + operation = await client.update_document(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1163,10 +1161,10 @@ async def reload_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: - [Document][google.cloud.dialogflow.v2beta1.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: + [Document][google.cloud.dialogflow.v2beta1.Document] Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. @@ -1192,11 +1190,11 @@ async def sample_reload_document(): ) # Make the request - operation = client.reload_document(request=request) + operation = await client.reload_document(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/client.py index 4eac5a87d645..40a85c9f3a78 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -65,12 +64,11 @@ import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.documents import pagers from google.cloud.dialogflow_v2beta1.types import document, gcs from google.cloud.dialogflow_v2beta1.types import document as gcd_document +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, DocumentsTransport from .transports.grpc import DocumentsGrpcTransport @@ -996,10 +994,10 @@ def create_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: - [Document][google.cloud.dialogflow.v2beta1.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: + [Document][google.cloud.dialogflow.v2beta1.Document] Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. @@ -1154,10 +1152,10 @@ def import_documents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: - [ImportDocumentsResponse][google.cloud.dialogflow.v2beta1.ImportDocumentsResponse] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: + [ImportDocumentsResponse][google.cloud.dialogflow.v2beta1.ImportDocumentsResponse] .. code-block:: python @@ -1272,10 +1270,10 @@ def delete_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: An `Empty + message `__ Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. @@ -1416,10 +1414,10 @@ def update_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: - [Document][google.cloud.dialogflow.v2beta1.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: + [Document][google.cloud.dialogflow.v2beta1.Document] Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. @@ -1583,10 +1581,10 @@ def reload_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: - [Document][google.cloud.dialogflow.v2beta1.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: + [Document][google.cloud.dialogflow.v2beta1.Document] Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/base.py index e42878e88204..5966c7debd45 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/base.py @@ -23,13 +23,12 @@ from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import document from google.cloud.dialogflow_v2beta1.types import document as gcd_document +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc.py index bb291e72cd8d..2d2074977b39 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc.py @@ -26,13 +26,12 @@ from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2beta1.types import document +from google.cloud.dialogflow_v2beta1.types import document as gcd_document from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2beta1.types import document -from google.cloud.dialogflow_v2beta1.types import document as gcd_document - from .base import DEFAULT_CLIENT_INFO, DocumentsTransport try: @@ -417,10 +416,10 @@ def create_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: - [Document][google.cloud.dialogflow.v2beta1.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: + [Document][google.cloud.dialogflow.v2beta1.Document] Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. @@ -458,10 +457,10 @@ def import_documents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: - [ImportDocumentsResponse][google.cloud.dialogflow.v2beta1.ImportDocumentsResponse] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: + [ImportDocumentsResponse][google.cloud.dialogflow.v2beta1.ImportDocumentsResponse] Returns: Callable[[~.ImportDocumentsRequest], @@ -494,10 +493,10 @@ def delete_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: An `Empty + message `__ Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. @@ -533,10 +532,10 @@ def update_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: - [Document][google.cloud.dialogflow.v2beta1.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: + [Document][google.cloud.dialogflow.v2beta1.Document] Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. @@ -580,10 +579,10 @@ def reload_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: - [Document][google.cloud.dialogflow.v2beta1.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: + [Document][google.cloud.dialogflow.v2beta1.Document] Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc_asyncio.py index de05e6e826e3..7e1cb54324ef 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc_asyncio.py @@ -28,14 +28,13 @@ 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.dialogflow_v2beta1.types import document +from google.cloud.dialogflow_v2beta1.types import document as gcd_document from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2beta1.types import document -from google.cloud.dialogflow_v2beta1.types import document as gcd_document - from .base import DEFAULT_CLIENT_INFO, DocumentsTransport from .grpc import DocumentsGrpcTransport @@ -429,10 +428,10 @@ def create_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: - [Document][google.cloud.dialogflow.v2beta1.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: + [Document][google.cloud.dialogflow.v2beta1.Document] Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. @@ -472,10 +471,10 @@ def import_documents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: - [ImportDocumentsResponse][google.cloud.dialogflow.v2beta1.ImportDocumentsResponse] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: + [ImportDocumentsResponse][google.cloud.dialogflow.v2beta1.ImportDocumentsResponse] Returns: Callable[[~.ImportDocumentsRequest], @@ -510,10 +509,10 @@ def delete_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: An `Empty - message `__ + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: An `Empty + message `__ Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. @@ -551,10 +550,10 @@ def update_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: - [Document][google.cloud.dialogflow.v2beta1.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: + [Document][google.cloud.dialogflow.v2beta1.Document] Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. @@ -600,10 +599,10 @@ def reload_document( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: - [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] - - ``response``: - [Document][google.cloud.dialogflow.v2beta1.Document] + - ``metadata``: + [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata] + - ``response``: + [Document][google.cloud.dialogflow.v2beta1.Document] Note: The ``projects.agent.knowledgeBases.documents`` resource is deprecated; only use ``projects.knowledgeBases.documents``. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/rest.py index a0fa3a320f1e..809ab229a568 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/rest.py @@ -25,14 +25,13 @@ 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.dialogflow_v2beta1.types import document +from google.cloud.dialogflow_v2beta1.types import document as gcd_document from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import document -from google.cloud.dialogflow_v2beta1.types import document as gcd_document - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDocumentsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/rest_base.py index 1095426e5e70..514539b141e8 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/rest_base.py @@ -18,13 +18,12 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2beta1.types import document +from google.cloud.dialogflow_v2beta1.types import document as gcd_document 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.dialogflow_v2beta1.types import document -from google.cloud.dialogflow_v2beta1.types import document as gcd_document - from .base import DEFAULT_CLIENT_INFO, DocumentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/async_client.py index ddf64ffede8b..b186c589b962 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,11 +45,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.types import encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import EncryptionSpecServiceClient from .transports.base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport @@ -86,15 +84,9 @@ class EncryptionSpecServiceAsyncClient: parse_encryption_spec_path = staticmethod( EncryptionSpecServiceClient.parse_encryption_spec_path ) - common_billing_account_path = staticmethod( - EncryptionSpecServiceClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - EncryptionSpecServiceClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(EncryptionSpecServiceClient.common_folder_path) - parse_common_folder_path = staticmethod( - EncryptionSpecServiceClient.parse_common_folder_path + common_project_path = staticmethod(EncryptionSpecServiceClient.common_project_path) + parse_common_project_path = staticmethod( + EncryptionSpecServiceClient.parse_common_project_path ) common_organization_path = staticmethod( EncryptionSpecServiceClient.common_organization_path @@ -102,9 +94,15 @@ class EncryptionSpecServiceAsyncClient: parse_common_organization_path = staticmethod( EncryptionSpecServiceClient.parse_common_organization_path ) - common_project_path = staticmethod(EncryptionSpecServiceClient.common_project_path) - parse_common_project_path = staticmethod( - EncryptionSpecServiceClient.parse_common_project_path + common_folder_path = staticmethod(EncryptionSpecServiceClient.common_folder_path) + parse_common_folder_path = staticmethod( + EncryptionSpecServiceClient.parse_common_folder_path + ) + common_billing_account_path = staticmethod( + EncryptionSpecServiceClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + EncryptionSpecServiceClient.parse_common_billing_account_path ) common_location_path = staticmethod( EncryptionSpecServiceClient.common_location_path @@ -467,11 +465,11 @@ async def sample_initialize_encryption_spec(): ) # Make the request - operation = client.initialize_encryption_spec(request=request) + operation = await client.initialize_encryption_spec(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/client.py index 6718622fc1f2..213b1996c646 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -63,11 +62,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.types import encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport from .transports.grpc import EncryptionSpecServiceGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/base.py index 753ad4ac8045..908799e4378b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/base.py @@ -23,13 +23,12 @@ from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc.py index 4d7d168df6d5..f62f25fdd64c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc.py @@ -26,13 +26,12 @@ from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2beta1.types import encryption_spec -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec - from .base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc_asyncio.py index 584c92e8111b..3bc35af680ad 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc_asyncio.py @@ -28,14 +28,13 @@ 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.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2beta1.types import encryption_spec -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec - from .base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport from .grpc import EncryptionSpecServiceGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest.py index a6af919aa120..0234d1349269 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest.py @@ -25,14 +25,13 @@ 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.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import encryption_spec -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEncryptionSpecServiceRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest_base.py index b262e1f2eca0..5fafe646e62e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest_base.py @@ -18,13 +18,12 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec 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.dialogflow_v2beta1.types import encryption_spec -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec - from .base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/async_client.py index e1a77c5aa107..64c8cb65e916 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -49,12 +48,11 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.entity_types import pagers from google.cloud.dialogflow_v2beta1.types import entity_type from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import EntityTypesClient from .transports.base import DEFAULT_CLIENT_INFO, EntityTypesTransport @@ -86,21 +84,21 @@ class EntityTypesAsyncClient: entity_type_path = staticmethod(EntityTypesClient.entity_type_path) parse_entity_type_path = staticmethod(EntityTypesClient.parse_entity_type_path) - common_billing_account_path = staticmethod( - EntityTypesClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - EntityTypesClient.parse_common_billing_account_path + common_project_path = staticmethod(EntityTypesClient.common_project_path) + parse_common_project_path = staticmethod( + EntityTypesClient.parse_common_project_path ) - common_folder_path = staticmethod(EntityTypesClient.common_folder_path) - parse_common_folder_path = staticmethod(EntityTypesClient.parse_common_folder_path) common_organization_path = staticmethod(EntityTypesClient.common_organization_path) parse_common_organization_path = staticmethod( EntityTypesClient.parse_common_organization_path ) - common_project_path = staticmethod(EntityTypesClient.common_project_path) - parse_common_project_path = staticmethod( - EntityTypesClient.parse_common_project_path + common_folder_path = staticmethod(EntityTypesClient.common_folder_path) + parse_common_folder_path = staticmethod(EntityTypesClient.parse_common_folder_path) + common_billing_account_path = staticmethod( + EntityTypesClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + EntityTypesClient.parse_common_billing_account_path ) common_location_path = staticmethod(EntityTypesClient.common_location_path) parse_common_location_path = staticmethod( @@ -348,8 +346,8 @@ async def sample_list_entity_types(): Required. The agent to list all entity types from. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -489,8 +487,8 @@ async def sample_get_entity_type(): Required. The name of the entity type. Supported formats: - - ``projects//agent/entityTypes/`` - - ``projects//locations//agent/entityTypes/`` + - ``projects//agent/entityTypes/`` + - ``projects//locations//agent/entityTypes/`` This corresponds to the ``name`` field on the ``request`` instance; if ``request`` is provided, this @@ -639,8 +637,8 @@ async def sample_create_entity_type(): Required. The agent to create a entity type for. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -941,8 +939,8 @@ async def sample_delete_entity_type(): Required. The name of the entity type to delete. Supported formats: - - ``projects//agent/entityTypes/`` - - ``projects//locations//agent/entityTypes/`` + - ``projects//agent/entityTypes/`` + - ``projects//locations//agent/entityTypes/`` This corresponds to the ``name`` field on the ``request`` instance; if ``request`` is provided, this @@ -1018,10 +1016,10 @@ async def batch_update_entity_types( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse] Note: You should always train an agent prior to sending it queries. See the `training @@ -1049,11 +1047,11 @@ async def sample_batch_update_entity_types(): ) # Make the request - operation = client.batch_update_entity_types(request=request) + operation = await client.batch_update_entity_types(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1137,10 +1135,10 @@ async def batch_delete_entity_types( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -1168,11 +1166,11 @@ async def sample_batch_delete_entity_types(): ) # Make the request - operation = client.batch_delete_entity_types(request=request) + operation = await client.batch_delete_entity_types(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1185,8 +1183,8 @@ async def sample_batch_delete_entity_types(): Required. The name of the agent to delete all entities types for. Supported formats: - - ``projects//agent``, - - ``projects//locations//agent``. + - ``projects//agent``, + - ``projects//locations//agent``. This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -1299,10 +1297,10 @@ async def batch_create_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -1333,11 +1331,11 @@ async def sample_batch_create_entities(): ) # Make the request - operation = client.batch_create_entities(request=request) + operation = await client.batch_create_entities(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1350,8 +1348,8 @@ async def sample_batch_create_entities(): Required. The name of the entity type to create entities in. Supported formats: - - ``projects//agent/entityTypes/`` - - ``projects//locations//agent/entityTypes/`` + - ``projects//agent/entityTypes/`` + - ``projects//locations//agent/entityTypes/`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -1480,10 +1478,10 @@ async def batch_update_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ .. code-block:: python @@ -1510,11 +1508,11 @@ async def sample_batch_update_entities(): ) # Make the request - operation = client.batch_update_entities(request=request) + operation = await client.batch_update_entities(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1527,8 +1525,8 @@ async def sample_batch_update_entities(): Required. The name of the entity type to update or create entities in. Supported formats: - - ``projects//agent/entityTypes/`` - - ``projects//locations//agent/entityTypes/`` + - ``projects//agent/entityTypes/`` + - ``projects//locations//agent/entityTypes/`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -1653,10 +1651,10 @@ async def batch_delete_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -1684,11 +1682,11 @@ async def sample_batch_delete_entities(): ) # Make the request - operation = client.batch_delete_entities(request=request) + operation = await client.batch_delete_entities(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1701,8 +1699,8 @@ async def sample_batch_delete_entities(): Required. The name of the entity type to delete entries for. Supported formats: - - ``projects//agent/entityTypes/`` - - ``projects//locations//agent/entityTypes/`` + - ``projects//agent/entityTypes/`` + - ``projects//locations//agent/entityTypes/`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/client.py index 23a36d5309bb..4f711d2f1b28 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -66,12 +65,11 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.entity_types import pagers from google.cloud.dialogflow_v2beta1.types import entity_type from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, EntityTypesTransport from .transports.grpc import EntityTypesGrpcTransport @@ -780,8 +778,8 @@ def sample_list_entity_types(): Required. The agent to list all entity types from. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -918,8 +916,8 @@ def sample_get_entity_type(): Required. The name of the entity type. Supported formats: - - ``projects//agent/entityTypes/`` - - ``projects//locations//agent/entityTypes/`` + - ``projects//agent/entityTypes/`` + - ``projects//locations//agent/entityTypes/`` This corresponds to the ``name`` field on the ``request`` instance; if ``request`` is provided, this @@ -1065,8 +1063,8 @@ def sample_create_entity_type(): Required. The agent to create a entity type for. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -1361,8 +1359,8 @@ def sample_delete_entity_type(): Required. The name of the entity type to delete. Supported formats: - - ``projects//agent/entityTypes/`` - - ``projects//locations//agent/entityTypes/`` + - ``projects//agent/entityTypes/`` + - ``projects//locations//agent/entityTypes/`` This corresponds to the ``name`` field on the ``request`` instance; if ``request`` is provided, this @@ -1435,10 +1433,10 @@ def batch_update_entity_types( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse] Note: You should always train an agent prior to sending it queries. See the `training @@ -1554,10 +1552,10 @@ def batch_delete_entity_types( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -1602,8 +1600,8 @@ def sample_batch_delete_entity_types(): Required. The name of the agent to delete all entities types for. Supported formats: - - ``projects//agent``, - - ``projects//locations//agent``. + - ``projects//agent``, + - ``projects//locations//agent``. This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -1715,10 +1713,10 @@ def batch_create_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -1766,8 +1764,8 @@ def sample_batch_create_entities(): Required. The name of the entity type to create entities in. Supported formats: - - ``projects//agent/entityTypes/`` - - ``projects//locations//agent/entityTypes/`` + - ``projects//agent/entityTypes/`` + - ``projects//locations//agent/entityTypes/`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -1893,10 +1891,10 @@ def batch_update_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ .. code-block:: python @@ -1940,8 +1938,8 @@ def sample_batch_update_entities(): Required. The name of the entity type to update or create entities in. Supported formats: - - ``projects//agent/entityTypes/`` - - ``projects//locations//agent/entityTypes/`` + - ``projects//agent/entityTypes/`` + - ``projects//locations//agent/entityTypes/`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -2063,10 +2061,10 @@ def batch_delete_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -2111,8 +2109,8 @@ def sample_batch_delete_entities(): Required. The name of the entity type to delete entries for. Supported formats: - - ``projects//agent/entityTypes/`` - - ``projects//locations//agent/entityTypes/`` + - ``projects//agent/entityTypes/`` + - ``projects//locations//agent/entityTypes/`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/base.py index 2aa82ad3ecb6..335b4180fdce 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/base.py @@ -24,13 +24,12 @@ from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import entity_type from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc.py index 0c85202c2742..28dee1031995 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc.py @@ -27,13 +27,12 @@ from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2beta1.types import entity_type -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type - from .base import DEFAULT_CLIENT_INFO, EntityTypesTransport try: @@ -511,10 +510,10 @@ def batch_update_entity_types( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse] Note: You should always train an agent prior to sending it queries. See the `training @@ -553,10 +552,10 @@ def batch_delete_entity_types( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -593,10 +592,10 @@ def batch_create_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -639,10 +638,10 @@ def batch_update_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Returns: Callable[[~.BatchUpdateEntitiesRequest], @@ -675,10 +674,10 @@ def batch_delete_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc_asyncio.py index edc60527c50f..91f0bd474b20 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc_asyncio.py @@ -29,14 +29,13 @@ 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.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2beta1.types import entity_type -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type - from .base import DEFAULT_CLIENT_INFO, EntityTypesTransport from .grpc import EntityTypesGrpcTransport @@ -522,10 +521,10 @@ def batch_update_entity_types( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse] Note: You should always train an agent prior to sending it queries. See the `training @@ -564,10 +563,10 @@ def batch_delete_entity_types( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -606,10 +605,10 @@ def batch_create_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -654,10 +653,10 @@ def batch_update_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Returns: Callable[[~.BatchUpdateEntitiesRequest], @@ -692,10 +691,10 @@ def batch_delete_entities( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest.py index 3e7c9a21d63f..20731ea30212 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest.py @@ -26,14 +26,13 @@ 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.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import entity_type -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEntityTypesRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest_base.py index 907a92e936e7..c59fd1e5373f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest_base.py @@ -19,13 +19,12 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type 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.dialogflow_v2beta1.types import entity_type -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type - from .base import DEFAULT_CLIENT_INFO, EntityTypesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/async_client.py index c800c4936b1a..5ceef1979ec4 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -45,11 +44,10 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.environments import pagers from google.cloud.dialogflow_v2beta1.types import environment, fulfillment +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import EnvironmentsClient from .transports.base import DEFAULT_CLIENT_INFO, EnvironmentsTransport @@ -85,21 +83,21 @@ class EnvironmentsAsyncClient: parse_fulfillment_path = staticmethod(EnvironmentsClient.parse_fulfillment_path) version_path = staticmethod(EnvironmentsClient.version_path) parse_version_path = staticmethod(EnvironmentsClient.parse_version_path) - common_billing_account_path = staticmethod( - EnvironmentsClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - EnvironmentsClient.parse_common_billing_account_path + common_project_path = staticmethod(EnvironmentsClient.common_project_path) + parse_common_project_path = staticmethod( + EnvironmentsClient.parse_common_project_path ) - common_folder_path = staticmethod(EnvironmentsClient.common_folder_path) - parse_common_folder_path = staticmethod(EnvironmentsClient.parse_common_folder_path) common_organization_path = staticmethod(EnvironmentsClient.common_organization_path) parse_common_organization_path = staticmethod( EnvironmentsClient.parse_common_organization_path ) - common_project_path = staticmethod(EnvironmentsClient.common_project_path) - parse_common_project_path = staticmethod( - EnvironmentsClient.parse_common_project_path + common_folder_path = staticmethod(EnvironmentsClient.common_folder_path) + parse_common_folder_path = staticmethod(EnvironmentsClient.parse_common_folder_path) + common_billing_account_path = staticmethod( + EnvironmentsClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + EnvironmentsClient.parse_common_billing_account_path ) common_location_path = staticmethod(EnvironmentsClient.common_location_path) parse_common_location_path = staticmethod( @@ -346,8 +344,8 @@ async def sample_list_environments(): Required. The agent to list all environments from. Format: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -492,10 +490,10 @@ async def sample_get_environment(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -598,10 +596,10 @@ async def sample_create_environment(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -714,10 +712,10 @@ async def sample_update_environment(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/client.py index 4c0a87860daf..f4a9d0c19b1c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -62,11 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.environments import pagers from google.cloud.dialogflow_v2beta1.types import environment, fulfillment +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, EnvironmentsTransport from .transports.grpc import EnvironmentsGrpcTransport @@ -808,8 +806,8 @@ def sample_list_environments(): Required. The agent to list all environments from. Format: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -951,10 +949,10 @@ def sample_get_environment(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -1055,10 +1053,10 @@ def sample_create_environment(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -1169,10 +1167,10 @@ def sample_update_environment(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/base.py index f4ece27c8a7b..2c6a07a3d72c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/base.py @@ -24,13 +24,12 @@ 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.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.cloud.dialogflow_v2beta1.types import environment 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 -from google.cloud.dialogflow_v2beta1 import gapic_version as package_version -from google.cloud.dialogflow_v2beta1.types import environment - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ ) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc.py index 67b62572cbd2..761ccbd9c70b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc.py @@ -27,12 +27,11 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2beta1.types import environment from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2beta1.types import environment - from .base import DEFAULT_CLIENT_INFO, EnvironmentsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc_asyncio.py index f7faed3b3928..c83236417b33 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc_asyncio.py @@ -29,13 +29,12 @@ 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.dialogflow_v2beta1.types import environment from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2beta1.types import environment - from .base import DEFAULT_CLIENT_INFO, EnvironmentsTransport from .grpc import EnvironmentsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest.py index e41eb24835c5..370916d63970 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest.py @@ -26,13 +26,12 @@ 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.dialogflow_v2beta1.types import environment from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import environment - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEnvironmentsRestTransport @@ -665,10 +664,10 @@ def __call__( can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the `versions and environments guide `__. @@ -941,10 +940,10 @@ def __call__( can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the `versions and environments guide `__. @@ -1404,10 +1403,10 @@ def __call__( can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the `versions and environments guide `__. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest_base.py index 5405fc70830c..4e4d6821c6d9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest_base.py @@ -19,12 +19,11 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2beta1.types import environment 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.dialogflow_v2beta1.types import environment - from .base import DEFAULT_CLIENT_INFO, EnvironmentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/async_client.py index 0f9b0dda998b..4025f246213b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -45,11 +44,10 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.types import fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import FulfillmentsClient from .transports.base import DEFAULT_CLIENT_INFO, FulfillmentsTransport @@ -81,21 +79,21 @@ class FulfillmentsAsyncClient: fulfillment_path = staticmethod(FulfillmentsClient.fulfillment_path) parse_fulfillment_path = staticmethod(FulfillmentsClient.parse_fulfillment_path) - common_billing_account_path = staticmethod( - FulfillmentsClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - FulfillmentsClient.parse_common_billing_account_path + common_project_path = staticmethod(FulfillmentsClient.common_project_path) + parse_common_project_path = staticmethod( + FulfillmentsClient.parse_common_project_path ) - common_folder_path = staticmethod(FulfillmentsClient.common_folder_path) - parse_common_folder_path = staticmethod(FulfillmentsClient.parse_common_folder_path) common_organization_path = staticmethod(FulfillmentsClient.common_organization_path) parse_common_organization_path = staticmethod( FulfillmentsClient.parse_common_organization_path ) - common_project_path = staticmethod(FulfillmentsClient.common_project_path) - parse_common_project_path = staticmethod( - FulfillmentsClient.parse_common_project_path + common_folder_path = staticmethod(FulfillmentsClient.common_folder_path) + parse_common_folder_path = staticmethod(FulfillmentsClient.parse_common_folder_path) + common_billing_account_path = staticmethod( + FulfillmentsClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + FulfillmentsClient.parse_common_billing_account_path ) common_location_path = staticmethod(FulfillmentsClient.common_location_path) parse_common_location_path = staticmethod( @@ -340,8 +338,8 @@ async def sample_get_fulfillment(): Required. The name of the fulfillment. Supported formats: - - ``projects//agent/fulfillment`` - - ``projects//locations//agent/fulfillment`` + - ``projects//agent/fulfillment`` + - ``projects//locations//agent/fulfillment`` This corresponds to the ``name`` field on the ``request`` instance; if ``request`` is provided, this diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/client.py index 6d3323b339b6..999d4922fb3b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -62,11 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.types import fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, FulfillmentsTransport from .transports.grpc import FulfillmentsGrpcTransport @@ -768,8 +766,8 @@ def sample_get_fulfillment(): Required. The name of the fulfillment. Supported formats: - - ``projects//agent/fulfillment`` - - ``projects//locations//agent/fulfillment`` + - ``projects//agent/fulfillment`` + - ``projects//locations//agent/fulfillment`` This corresponds to the ``name`` field on the ``request`` instance; if ``request`` is provided, this diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/base.py index ccaa4d3004c7..7dd6eefe0a6e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/base.py @@ -23,13 +23,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc.py index 2152d7744d85..8157be62c985 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc.py @@ -26,13 +26,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2beta1.types import fulfillment -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment - from .base import DEFAULT_CLIENT_INFO, FulfillmentsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc_asyncio.py index 37d3d0accd8a..4d7a21ed6e6b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc_asyncio.py @@ -28,14 +28,13 @@ 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.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2beta1.types import fulfillment -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment - from .base import DEFAULT_CLIENT_INFO, FulfillmentsTransport from .grpc import FulfillmentsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest.py index 34b7392afc02..87074ebfa162 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest.py @@ -25,14 +25,13 @@ 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.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import fulfillment -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseFulfillmentsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest_base.py index 332afa99da6c..629bf6129625 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest_base.py @@ -18,13 +18,12 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment 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.dialogflow_v2beta1.types import fulfillment -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment - from .base import DEFAULT_CLIENT_INFO, FulfillmentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/async_client.py index f1a0bdcf0d7c..6b11c47f503e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -47,9 +46,6 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.generator_evaluations import pagers from google.cloud.dialogflow_v2beta1.types import ( generator, @@ -59,6 +55,8 @@ from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import GeneratorEvaluationsClient from .transports.base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport @@ -86,6 +84,12 @@ class GeneratorEvaluationsAsyncClient: _DEFAULT_ENDPOINT_TEMPLATE = GeneratorEvaluationsClient._DEFAULT_ENDPOINT_TEMPLATE _DEFAULT_UNIVERSE = GeneratorEvaluationsClient._DEFAULT_UNIVERSE + app_path = staticmethod(GeneratorEvaluationsClient.app_path) + parse_app_path = staticmethod(GeneratorEvaluationsClient.parse_app_path) + ces_tool_path = staticmethod(GeneratorEvaluationsClient.ces_tool_path) + parse_ces_tool_path = staticmethod(GeneratorEvaluationsClient.parse_ces_tool_path) + toolset_path = staticmethod(GeneratorEvaluationsClient.toolset_path) + parse_toolset_path = staticmethod(GeneratorEvaluationsClient.parse_toolset_path) generator_path = staticmethod(GeneratorEvaluationsClient.generator_path) parse_generator_path = staticmethod(GeneratorEvaluationsClient.parse_generator_path) generator_evaluation_path = staticmethod( @@ -96,15 +100,9 @@ class GeneratorEvaluationsAsyncClient: ) tool_path = staticmethod(GeneratorEvaluationsClient.tool_path) parse_tool_path = staticmethod(GeneratorEvaluationsClient.parse_tool_path) - common_billing_account_path = staticmethod( - GeneratorEvaluationsClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - GeneratorEvaluationsClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(GeneratorEvaluationsClient.common_folder_path) - parse_common_folder_path = staticmethod( - GeneratorEvaluationsClient.parse_common_folder_path + common_project_path = staticmethod(GeneratorEvaluationsClient.common_project_path) + parse_common_project_path = staticmethod( + GeneratorEvaluationsClient.parse_common_project_path ) common_organization_path = staticmethod( GeneratorEvaluationsClient.common_organization_path @@ -112,9 +110,15 @@ class GeneratorEvaluationsAsyncClient: parse_common_organization_path = staticmethod( GeneratorEvaluationsClient.parse_common_organization_path ) - common_project_path = staticmethod(GeneratorEvaluationsClient.common_project_path) - parse_common_project_path = staticmethod( - GeneratorEvaluationsClient.parse_common_project_path + common_folder_path = staticmethod(GeneratorEvaluationsClient.common_folder_path) + parse_common_folder_path = staticmethod( + GeneratorEvaluationsClient.parse_common_folder_path + ) + common_billing_account_path = staticmethod( + GeneratorEvaluationsClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + GeneratorEvaluationsClient.parse_common_billing_account_path ) common_location_path = staticmethod(GeneratorEvaluationsClient.common_location_path) parse_common_location_path = staticmethod( @@ -363,11 +367,11 @@ async def sample_create_generator_evaluation(): ) # Make the request - operation = client.create_generator_evaluation(request=request) + operation = await client.create_generator_evaluation(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/client.py index d6abe20edb25..42cb61459e8c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -64,9 +63,6 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.generator_evaluations import pagers from google.cloud.dialogflow_v2beta1.types import ( generator, @@ -76,6 +72,8 @@ from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport from .transports.grpc import GeneratorEvaluationsGrpcTransport @@ -239,6 +237,76 @@ def transport(self) -> GeneratorEvaluationsTransport: """ return self._transport + @staticmethod + def app_path( + project: str, + location: str, + app: str, + ) -> str: + """Returns a fully-qualified app string.""" + return "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + + @staticmethod + def parse_app_path(path: str) -> Dict[str, str]: + """Parses a app path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def ces_tool_path( + project: str, + location: str, + app: str, + tool: str, + ) -> str: + """Returns a fully-qualified ces_tool string.""" + return "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + + @staticmethod + def parse_ces_tool_path(path: str) -> Dict[str, str]: + """Parses a ces_tool path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/tools/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def toolset_path( + project: str, + location: str, + app: str, + toolset: str, + ) -> str: + """Returns a fully-qualified toolset string.""" + return "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + + @staticmethod + def parse_toolset_path(path: str) -> Dict[str, str]: + """Parses a toolset path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/toolsets/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def generator_path( project: str, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/base.py index 23bc32afc8a9..29d59ccf7813 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/base.py @@ -24,15 +24,14 @@ from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import generator_evaluation from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc.py index 0fe2c58ac63d..d21bde8f8cc2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc.py @@ -27,14 +27,13 @@ from google.api_core import gapic_v1, grpc_helpers, 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 - from google.cloud.dialogflow_v2beta1.types import generator_evaluation from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from .base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc_asyncio.py index 89bfd990ee8d..f893455c2923 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc_asyncio.py @@ -29,15 +29,14 @@ 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 -from grpc.experimental import aio # type: ignore - from google.cloud.dialogflow_v2beta1.types import generator_evaluation from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from grpc.experimental import aio # type: ignore from .base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport from .grpc import GeneratorEvaluationsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest.py index f34deb3a2901..3372fbd10c9c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest.py @@ -26,15 +26,14 @@ 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.protobuf import json_format -from requests import __version__ as requests_version - from google.cloud.dialogflow_v2beta1.types import generator_evaluation from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import json_format +from requests import __version__ as requests_version from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseGeneratorEvaluationsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest_base.py index 136c27d7d88d..97589eb22637 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest_base.py @@ -19,14 +19,13 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore 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.dialogflow_v2beta1.types import generator_evaluation from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import json_format from .base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/async_client.py index 5e1ac807480a..7730a6079480 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,12 +45,11 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.generators import pagers -from google.cloud.dialogflow_v2beta1.types import generator +from google.cloud.dialogflow_v2beta1.types import ces_app, ces_tool, generator, toolset from google.cloud.dialogflow_v2beta1.types import generator as gcd_generator +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import GeneratorsClient from .transports.base import DEFAULT_CLIENT_INFO, GeneratorsTransport @@ -84,24 +82,30 @@ class GeneratorsAsyncClient: _DEFAULT_ENDPOINT_TEMPLATE = GeneratorsClient._DEFAULT_ENDPOINT_TEMPLATE _DEFAULT_UNIVERSE = GeneratorsClient._DEFAULT_UNIVERSE + app_path = staticmethod(GeneratorsClient.app_path) + parse_app_path = staticmethod(GeneratorsClient.parse_app_path) + ces_tool_path = staticmethod(GeneratorsClient.ces_tool_path) + parse_ces_tool_path = staticmethod(GeneratorsClient.parse_ces_tool_path) + toolset_path = staticmethod(GeneratorsClient.toolset_path) + parse_toolset_path = staticmethod(GeneratorsClient.parse_toolset_path) generator_path = staticmethod(GeneratorsClient.generator_path) parse_generator_path = staticmethod(GeneratorsClient.parse_generator_path) tool_path = staticmethod(GeneratorsClient.tool_path) parse_tool_path = staticmethod(GeneratorsClient.parse_tool_path) + common_project_path = staticmethod(GeneratorsClient.common_project_path) + parse_common_project_path = staticmethod(GeneratorsClient.parse_common_project_path) + common_organization_path = staticmethod(GeneratorsClient.common_organization_path) + parse_common_organization_path = staticmethod( + GeneratorsClient.parse_common_organization_path + ) + common_folder_path = staticmethod(GeneratorsClient.common_folder_path) + parse_common_folder_path = staticmethod(GeneratorsClient.parse_common_folder_path) common_billing_account_path = staticmethod( GeneratorsClient.common_billing_account_path ) parse_common_billing_account_path = staticmethod( GeneratorsClient.parse_common_billing_account_path ) - common_folder_path = staticmethod(GeneratorsClient.common_folder_path) - parse_common_folder_path = staticmethod(GeneratorsClient.parse_common_folder_path) - common_organization_path = staticmethod(GeneratorsClient.common_organization_path) - parse_common_organization_path = staticmethod( - GeneratorsClient.parse_common_organization_path - ) - common_project_path = staticmethod(GeneratorsClient.common_project_path) - parse_common_project_path = staticmethod(GeneratorsClient.parse_common_project_path) common_location_path = staticmethod(GeneratorsClient.common_location_path) parse_common_location_path = staticmethod( GeneratorsClient.parse_common_location_path diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/client.py index 127c45a5f3c7..3ceccda55e51 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -63,12 +62,11 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.generators import pagers -from google.cloud.dialogflow_v2beta1.types import generator +from google.cloud.dialogflow_v2beta1.types import ces_app, ces_tool, generator, toolset from google.cloud.dialogflow_v2beta1.types import generator as gcd_generator +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, GeneratorsTransport from .transports.grpc import GeneratorsGrpcTransport @@ -237,6 +235,76 @@ def transport(self) -> GeneratorsTransport: """ return self._transport + @staticmethod + def app_path( + project: str, + location: str, + app: str, + ) -> str: + """Returns a fully-qualified app string.""" + return "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + + @staticmethod + def parse_app_path(path: str) -> Dict[str, str]: + """Parses a app path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def ces_tool_path( + project: str, + location: str, + app: str, + tool: str, + ) -> str: + """Returns a fully-qualified ces_tool string.""" + return "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + + @staticmethod + def parse_ces_tool_path(path: str) -> Dict[str, str]: + """Parses a ces_tool path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/tools/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def toolset_path( + project: str, + location: str, + app: str, + toolset: str, + ) -> str: + """Returns a fully-qualified toolset string.""" + return "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + + @staticmethod + def parse_toolset_path(path: str) -> Dict[str, str]: + """Parses a toolset path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/toolsets/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def generator_path( project: str, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/base.py index b722d9dffcb1..eefbd2bc7fac 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/base.py @@ -24,13 +24,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import generator from google.cloud.dialogflow_v2beta1.types import generator as gcd_generator +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc.py index ed1b3b4257e7..56dc33d0c0a5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc.py @@ -27,13 +27,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2beta1.types import generator +from google.cloud.dialogflow_v2beta1.types import generator as gcd_generator from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2beta1.types import generator -from google.cloud.dialogflow_v2beta1.types import generator as gcd_generator - from .base import DEFAULT_CLIENT_INFO, GeneratorsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc_asyncio.py index 5017fbc56964..6086f4ea0e9d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc_asyncio.py @@ -29,14 +29,13 @@ 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.dialogflow_v2beta1.types import generator +from google.cloud.dialogflow_v2beta1.types import generator as gcd_generator from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2beta1.types import generator -from google.cloud.dialogflow_v2beta1.types import generator as gcd_generator - from .base import DEFAULT_CLIENT_INFO, GeneratorsTransport from .grpc import GeneratorsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest.py index 18c798d25efa..4d27b34dca92 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest.py @@ -26,14 +26,13 @@ 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.dialogflow_v2beta1.types import generator +from google.cloud.dialogflow_v2beta1.types import generator as gcd_generator from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import generator -from google.cloud.dialogflow_v2beta1.types import generator as gcd_generator - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseGeneratorsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest_base.py index dcc7fefbf66c..db06f37c4305 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest_base.py @@ -19,13 +19,12 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2beta1.types import generator +from google.cloud.dialogflow_v2beta1.types import generator as gcd_generator 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.dialogflow_v2beta1.types import generator -from google.cloud.dialogflow_v2beta1.types import generator as gcd_generator - from .base import DEFAULT_CLIENT_INFO, GeneratorsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/async_client.py index f767288f2b78..aa52e52e0e2c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -49,12 +48,11 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.intents import pagers from google.cloud.dialogflow_v2beta1.types import context, intent from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import IntentsClient from .transports.base import DEFAULT_CLIENT_INFO, IntentsTransport @@ -88,20 +86,20 @@ class IntentsAsyncClient: parse_context_path = staticmethod(IntentsClient.parse_context_path) intent_path = staticmethod(IntentsClient.intent_path) parse_intent_path = staticmethod(IntentsClient.parse_intent_path) + common_project_path = staticmethod(IntentsClient.common_project_path) + parse_common_project_path = staticmethod(IntentsClient.parse_common_project_path) + common_organization_path = staticmethod(IntentsClient.common_organization_path) + parse_common_organization_path = staticmethod( + IntentsClient.parse_common_organization_path + ) + common_folder_path = staticmethod(IntentsClient.common_folder_path) + parse_common_folder_path = staticmethod(IntentsClient.parse_common_folder_path) common_billing_account_path = staticmethod( IntentsClient.common_billing_account_path ) parse_common_billing_account_path = staticmethod( IntentsClient.parse_common_billing_account_path ) - common_folder_path = staticmethod(IntentsClient.common_folder_path) - parse_common_folder_path = staticmethod(IntentsClient.parse_common_folder_path) - common_organization_path = staticmethod(IntentsClient.common_organization_path) - parse_common_organization_path = staticmethod( - IntentsClient.parse_common_organization_path - ) - common_project_path = staticmethod(IntentsClient.common_project_path) - parse_common_project_path = staticmethod(IntentsClient.parse_common_project_path) common_location_path = staticmethod(IntentsClient.common_location_path) parse_common_location_path = staticmethod(IntentsClient.parse_common_location_path) @@ -492,8 +490,8 @@ async def sample_get_intent(): name (:class:`str`): Required. The name of the intent. Supported formats: - - ``projects//agent/intents/`` - - ``projects//locations//agent/intents/`` + - ``projects//agent/intents/`` + - ``projects//locations//agent/intents/`` This corresponds to the ``name`` field on the ``request`` instance; if ``request`` is provided, this @@ -637,8 +635,8 @@ async def sample_create_intent(): Required. The agent to create a intent for. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -934,8 +932,8 @@ async def sample_delete_intent(): Supported formats: - - ``projects//agent/intents/`` - - ``projects//locations//agent/intents/`` + - ``projects//agent/intents/`` + - ``projects//locations//agent/intents/`` This corresponds to the ``name`` field on the ``request`` instance; if ``request`` is provided, this @@ -1012,10 +1010,10 @@ async def batch_update_intents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse] Note: You should always train an agent prior to sending it queries. See the `training @@ -1043,11 +1041,11 @@ async def sample_batch_update_intents(): ) # Make the request - operation = client.batch_update_intents(request=request) + operation = await client.batch_update_intents(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1060,8 +1058,8 @@ async def sample_batch_update_intents(): Required. The name of the agent to update or create intents in. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -1178,10 +1176,10 @@ async def batch_delete_intents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -1212,11 +1210,11 @@ async def sample_batch_delete_intents(): ) # Make the request - operation = client.batch_delete_intents(request=request) + operation = await client.batch_delete_intents(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) @@ -1229,8 +1227,8 @@ async def sample_batch_delete_intents(): Required. The name of the agent to delete all entities types for. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/client.py index 4c9845644a22..334e0eecf248 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -66,12 +65,11 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.intents import pagers from google.cloud.dialogflow_v2beta1.types import context, intent from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, IntentsTransport from .transports.grpc import IntentsGrpcTransport @@ -943,8 +941,8 @@ def sample_get_intent(): name (str): Required. The name of the intent. Supported formats: - - ``projects//agent/intents/`` - - ``projects//locations//agent/intents/`` + - ``projects//agent/intents/`` + - ``projects//locations//agent/intents/`` This corresponds to the ``name`` field on the ``request`` instance; if ``request`` is provided, this @@ -1085,8 +1083,8 @@ def sample_create_intent(): Required. The agent to create a intent for. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -1376,8 +1374,8 @@ def sample_delete_intent(): Supported formats: - - ``projects//agent/intents/`` - - ``projects//locations//agent/intents/`` + - ``projects//agent/intents/`` + - ``projects//locations//agent/intents/`` This corresponds to the ``name`` field on the ``request`` instance; if ``request`` is provided, this @@ -1451,10 +1449,10 @@ def batch_update_intents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse] Note: You should always train an agent prior to sending it queries. See the `training @@ -1499,8 +1497,8 @@ def sample_batch_update_intents(): Required. The name of the agent to update or create intents in. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -1614,10 +1612,10 @@ def batch_delete_intents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training @@ -1665,8 +1663,8 @@ def sample_batch_delete_intents(): Required. The name of the agent to delete all entities types for. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/base.py index bf80603c6f30..92c4a137dd5e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/base.py @@ -24,13 +24,12 @@ from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import intent from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc.py index 7dc58ea1a8b1..90aec49b13a8 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc.py @@ -27,13 +27,12 @@ from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2beta1.types import intent +from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2beta1.types import intent -from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent - from .base import DEFAULT_CLIENT_INFO, IntentsTransport try: @@ -500,10 +499,10 @@ def batch_update_intents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse] Note: You should always train an agent prior to sending it queries. See the `training @@ -540,10 +539,10 @@ def batch_delete_intents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc_asyncio.py index 3f2518674751..c9938ac27b0a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc_asyncio.py @@ -29,14 +29,13 @@ 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.dialogflow_v2beta1.types import intent +from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2beta1.types import intent -from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent - from .base import DEFAULT_CLIENT_INFO, IntentsTransport from .grpc import IntentsGrpcTransport @@ -514,10 +513,10 @@ def batch_update_intents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: - [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse] + - ``metadata``: An empty `Struct + message `__ + - ``response``: + [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse] Note: You should always train an agent prior to sending it queries. See the `training @@ -556,10 +555,10 @@ def batch_delete_intents( The returned ``Operation`` type has the following method-specific fields: - - ``metadata``: An empty `Struct - message `__ - - ``response``: An `Empty - message `__ + - ``metadata``: An empty `Struct + message `__ + - ``response``: An `Empty + message `__ Note: You should always train an agent prior to sending it queries. See the `training diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest.py index 4739d9dd89bb..a8bab0fe41fe 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest.py @@ -26,14 +26,13 @@ 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.dialogflow_v2beta1.types import intent +from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import intent -from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseIntentsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest_base.py index 9fc45e9205ae..53bd2806174d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest_base.py @@ -19,13 +19,12 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2beta1.types import intent +from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent 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.dialogflow_v2beta1.types import intent -from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent - from .base import DEFAULT_CLIENT_INFO, IntentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/async_client.py index 365f2acc7ff0..4077ec503a5f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -45,12 +44,11 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.knowledge_bases import pagers from google.cloud.dialogflow_v2beta1.types import knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import KnowledgeBasesClient from .transports.base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport @@ -84,15 +82,9 @@ class KnowledgeBasesAsyncClient: parse_knowledge_base_path = staticmethod( KnowledgeBasesClient.parse_knowledge_base_path ) - common_billing_account_path = staticmethod( - KnowledgeBasesClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - KnowledgeBasesClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(KnowledgeBasesClient.common_folder_path) - parse_common_folder_path = staticmethod( - KnowledgeBasesClient.parse_common_folder_path + common_project_path = staticmethod(KnowledgeBasesClient.common_project_path) + parse_common_project_path = staticmethod( + KnowledgeBasesClient.parse_common_project_path ) common_organization_path = staticmethod( KnowledgeBasesClient.common_organization_path @@ -100,9 +92,15 @@ class KnowledgeBasesAsyncClient: parse_common_organization_path = staticmethod( KnowledgeBasesClient.parse_common_organization_path ) - common_project_path = staticmethod(KnowledgeBasesClient.common_project_path) - parse_common_project_path = staticmethod( - KnowledgeBasesClient.parse_common_project_path + common_folder_path = staticmethod(KnowledgeBasesClient.common_folder_path) + parse_common_folder_path = staticmethod( + KnowledgeBasesClient.parse_common_folder_path + ) + common_billing_account_path = staticmethod( + KnowledgeBasesClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + KnowledgeBasesClient.parse_common_billing_account_path ) common_location_path = staticmethod(KnowledgeBasesClient.common_location_path) parse_common_location_path = staticmethod( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/client.py index 4d75c2f769e3..aadde36c3533 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -62,12 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.knowledge_bases import pagers from google.cloud.dialogflow_v2beta1.types import knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport from .transports.grpc import KnowledgeBasesGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/base.py index aed46d5a344a..44b93119d377 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/base.py @@ -24,13 +24,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc.py index c70a4e1e822f..b08e6f7eacda 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc.py @@ -27,13 +27,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2beta1.types import knowledge_base -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base - from .base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc_asyncio.py index 39a1babf8536..bbea4e9bb4e1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc_asyncio.py @@ -29,14 +29,13 @@ 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.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2beta1.types import knowledge_base -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base - from .base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport from .grpc import KnowledgeBasesGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest.py index 8c0d73803eeb..c3d4ba5ce1cb 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest.py @@ -26,14 +26,13 @@ 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.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import knowledge_base -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseKnowledgeBasesRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest_base.py index 09ef3b31bc17..d8db399bc5c4 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest_base.py @@ -19,13 +19,12 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base 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.dialogflow_v2beta1.types import knowledge_base -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base - from .base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/async_client.py index ea752c961ac2..ebe4be7c4969 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/async_client.py @@ -39,9 +39,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -49,12 +48,11 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.participants import pagers from google.cloud.dialogflow_v2beta1.types import participant, session from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import ParticipantsClient from .transports.base import DEFAULT_CLIENT_INFO, ParticipantsTransport @@ -84,6 +82,12 @@ class ParticipantsAsyncClient: _DEFAULT_ENDPOINT_TEMPLATE = ParticipantsClient._DEFAULT_ENDPOINT_TEMPLATE _DEFAULT_UNIVERSE = ParticipantsClient._DEFAULT_UNIVERSE + app_path = staticmethod(ParticipantsClient.app_path) + parse_app_path = staticmethod(ParticipantsClient.parse_app_path) + ces_tool_path = staticmethod(ParticipantsClient.ces_tool_path) + parse_ces_tool_path = staticmethod(ParticipantsClient.parse_ces_tool_path) + toolset_path = staticmethod(ParticipantsClient.toolset_path) + parse_toolset_path = staticmethod(ParticipantsClient.parse_toolset_path) answer_record_path = staticmethod(ParticipantsClient.answer_record_path) parse_answer_record_path = staticmethod(ParticipantsClient.parse_answer_record_path) context_path = staticmethod(ParticipantsClient.context_path) @@ -96,29 +100,29 @@ class ParticipantsAsyncClient: parse_message_path = staticmethod(ParticipantsClient.parse_message_path) participant_path = staticmethod(ParticipantsClient.participant_path) parse_participant_path = staticmethod(ParticipantsClient.parse_participant_path) - phrase_set_path = staticmethod(ParticipantsClient.phrase_set_path) - parse_phrase_set_path = staticmethod(ParticipantsClient.parse_phrase_set_path) session_entity_type_path = staticmethod(ParticipantsClient.session_entity_type_path) parse_session_entity_type_path = staticmethod( ParticipantsClient.parse_session_entity_type_path ) tool_path = staticmethod(ParticipantsClient.tool_path) parse_tool_path = staticmethod(ParticipantsClient.parse_tool_path) - common_billing_account_path = staticmethod( - ParticipantsClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - ParticipantsClient.parse_common_billing_account_path + phrase_set_path = staticmethod(ParticipantsClient.phrase_set_path) + parse_phrase_set_path = staticmethod(ParticipantsClient.parse_phrase_set_path) + common_project_path = staticmethod(ParticipantsClient.common_project_path) + parse_common_project_path = staticmethod( + ParticipantsClient.parse_common_project_path ) - common_folder_path = staticmethod(ParticipantsClient.common_folder_path) - parse_common_folder_path = staticmethod(ParticipantsClient.parse_common_folder_path) common_organization_path = staticmethod(ParticipantsClient.common_organization_path) parse_common_organization_path = staticmethod( ParticipantsClient.parse_common_organization_path ) - common_project_path = staticmethod(ParticipantsClient.common_project_path) - parse_common_project_path = staticmethod( - ParticipantsClient.parse_common_project_path + common_folder_path = staticmethod(ParticipantsClient.common_folder_path) + parse_common_folder_path = staticmethod(ParticipantsClient.parse_common_folder_path) + common_billing_account_path = staticmethod( + ParticipantsClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + ParticipantsClient.parse_common_billing_account_path ) common_location_path = staticmethod(ParticipantsClient.common_location_path) parse_common_location_path = staticmethod( @@ -1046,9 +1050,9 @@ def request_generator(): However, note that: - - Dialogflow will bill you for the audio so far. - - Dialogflow discards all Speech recognition results - in favor of the text input. + - Dialogflow will bill you for the audio so far. + - Dialogflow discards all Speech recognition results + in favor of the text input. 3. If [StreamingAnalyzeContentRequest.config][google.cloud.dialogflow.v2beta1.StreamingAnalyzeContentRequest.config] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/client.py index 9f72fefeec53..07d036a8aaa9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/client.py @@ -45,9 +45,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -64,12 +63,11 @@ _LOGGER = std_logging.getLogger(__name__) import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.participants import pagers from google.cloud.dialogflow_v2beta1.types import participant, session from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, ParticipantsTransport from .transports.grpc import ParticipantsGrpcTransport @@ -235,6 +233,76 @@ def transport(self) -> ParticipantsTransport: """ return self._transport + @staticmethod + def app_path( + project: str, + location: str, + app: str, + ) -> str: + """Returns a fully-qualified app string.""" + return "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + + @staticmethod + def parse_app_path(path: str) -> Dict[str, str]: + """Parses a app path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def ces_tool_path( + project: str, + location: str, + app: str, + tool: str, + ) -> str: + """Returns a fully-qualified ces_tool string.""" + return "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + + @staticmethod + def parse_ces_tool_path(path: str) -> Dict[str, str]: + """Parses a ces_tool path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/tools/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + + @staticmethod + def toolset_path( + project: str, + location: str, + app: str, + toolset: str, + ) -> str: + """Returns a fully-qualified toolset string.""" + return "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + + @staticmethod + def parse_toolset_path(path: str) -> Dict[str, str]: + """Parses a toolset path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/apps/(?P.+?)/toolsets/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def answer_record_path( project: str, @@ -361,28 +429,6 @@ def parse_participant_path(path: str) -> Dict[str, str]: ) return m.groupdict() if m else {} - @staticmethod - def phrase_set_path( - project: str, - location: str, - phrase_set: str, - ) -> str: - """Returns a fully-qualified phrase_set string.""" - return "projects/{project}/locations/{location}/phraseSets/{phrase_set}".format( - project=project, - location=location, - phrase_set=phrase_set, - ) - - @staticmethod - def parse_phrase_set_path(path: str) -> Dict[str, str]: - """Parses a phrase_set path into its component segments.""" - m = re.match( - r"^projects/(?P.+?)/locations/(?P.+?)/phraseSets/(?P.+?)$", - path, - ) - return m.groupdict() if m else {} - @staticmethod def session_entity_type_path( project: str, @@ -427,6 +473,28 @@ def parse_tool_path(path: str) -> Dict[str, str]: ) return m.groupdict() if m else {} + @staticmethod + def phrase_set_path( + project: str, + location: str, + phrase_set: str, + ) -> str: + """Returns a fully-qualified phrase_set string.""" + return "projects/{project}/locations/{location}/phraseSets/{phrase_set}".format( + project=project, + location=location, + phrase_set=phrase_set, + ) + + @staticmethod + def parse_phrase_set_path(path: str) -> Dict[str, str]: + """Parses a phrase_set path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/phraseSets/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def common_billing_account_path( billing_account: str, @@ -1614,9 +1682,9 @@ def request_generator(): However, note that: - - Dialogflow will bill you for the audio so far. - - Dialogflow discards all Speech recognition results - in favor of the text input. + - Dialogflow will bill you for the audio so far. + - Dialogflow discards all Speech recognition results + in favor of the text input. 3. If [StreamingAnalyzeContentRequest.config][google.cloud.dialogflow.v2beta1.StreamingAnalyzeContentRequest.config] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/base.py index 909eec1506d0..c28532a34342 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/base.py @@ -23,13 +23,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import participant from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc.py index 38e837b20a4b..4d74e5c8a1ac 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc.py @@ -26,13 +26,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2beta1.types import participant +from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2beta1.types import participant -from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant - from .base import DEFAULT_CLIENT_INFO, ParticipantsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc_asyncio.py index 2ea8af056ac1..3b76c1f81d3f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc_asyncio.py @@ -28,14 +28,13 @@ 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.dialogflow_v2beta1.types import participant +from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2beta1.types import participant -from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant - from .base import DEFAULT_CLIENT_INFO, ParticipantsTransport from .grpc import ParticipantsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest.py index 59a1a04f8da4..66dce51c1426 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest.py @@ -25,14 +25,13 @@ 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.dialogflow_v2beta1.types import participant +from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import participant -from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseParticipantsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest_base.py index 90e203b8845d..18c9fda82930 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest_base.py @@ -18,13 +18,12 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2beta1.types import participant +from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant 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.dialogflow_v2beta1.types import participant -from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant - from .base import DEFAULT_CLIENT_INFO, ParticipantsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/async_client.py index 1c48b6fb5b57..393680a87a02 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -45,12 +44,12 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.phone_numbers import pagers from google.cloud.dialogflow_v2beta1.types import phone_number from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import PhoneNumbersClient from .transports.base import DEFAULT_CLIENT_INFO, PhoneNumbersTransport @@ -82,21 +81,23 @@ class PhoneNumbersAsyncClient: phone_number_path = staticmethod(PhoneNumbersClient.phone_number_path) parse_phone_number_path = staticmethod(PhoneNumbersClient.parse_phone_number_path) - common_billing_account_path = staticmethod( - PhoneNumbersClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - PhoneNumbersClient.parse_common_billing_account_path + sip_trunk_path = staticmethod(PhoneNumbersClient.sip_trunk_path) + parse_sip_trunk_path = staticmethod(PhoneNumbersClient.parse_sip_trunk_path) + common_project_path = staticmethod(PhoneNumbersClient.common_project_path) + parse_common_project_path = staticmethod( + PhoneNumbersClient.parse_common_project_path ) - common_folder_path = staticmethod(PhoneNumbersClient.common_folder_path) - parse_common_folder_path = staticmethod(PhoneNumbersClient.parse_common_folder_path) common_organization_path = staticmethod(PhoneNumbersClient.common_organization_path) parse_common_organization_path = staticmethod( PhoneNumbersClient.parse_common_organization_path ) - common_project_path = staticmethod(PhoneNumbersClient.common_project_path) - parse_common_project_path = staticmethod( - PhoneNumbersClient.parse_common_project_path + common_folder_path = staticmethod(PhoneNumbersClient.common_folder_path) + parse_common_folder_path = staticmethod(PhoneNumbersClient.parse_common_folder_path) + common_billing_account_path = staticmethod( + PhoneNumbersClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + PhoneNumbersClient.parse_common_billing_account_path ) common_location_path = staticmethod(PhoneNumbersClient.common_location_path) parse_common_location_path = staticmethod( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/client.py index fa5f32da9a9f..dfa8237c14b7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -62,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.phone_numbers import pagers from google.cloud.dialogflow_v2beta1.types import phone_number from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, PhoneNumbersTransport from .transports.grpc import PhoneNumbersGrpcTransport @@ -252,6 +251,28 @@ def parse_phone_number_path(path: str) -> Dict[str, str]: ) return m.groupdict() if m else {} + @staticmethod + def sip_trunk_path( + project: str, + location: str, + siptrunk: str, + ) -> str: + """Returns a fully-qualified sip_trunk string.""" + return "projects/{project}/locations/{location}/sipTrunks/{siptrunk}".format( + project=project, + location=location, + siptrunk=siptrunk, + ) + + @staticmethod + def parse_sip_trunk_path(path: str) -> Dict[str, str]: + """Parses a sip_trunk path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/sipTrunks/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def common_billing_account_path( billing_account: str, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/base.py index e0437fa62d9f..9026a0ef921e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/base.py @@ -23,13 +23,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import phone_number from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc.py index 5bc7c2add3c9..9232db53e7a7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc.py @@ -26,13 +26,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2beta1.types import phone_number -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number - from .base import DEFAULT_CLIENT_INFO, PhoneNumbersTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc_asyncio.py index 6d328ff55b6c..a438bbe4f55b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc_asyncio.py @@ -28,14 +28,13 @@ 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.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2beta1.types import phone_number -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number - from .base import DEFAULT_CLIENT_INFO, PhoneNumbersTransport from .grpc import PhoneNumbersGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest.py index 44f7fd11a4e3..17b035d16722 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest.py @@ -25,14 +25,13 @@ 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.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import phone_number -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BasePhoneNumbersRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest_base.py index bcc4330901d9..1a5b13d76313 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest_base.py @@ -18,13 +18,12 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number 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.dialogflow_v2beta1.types import phone_number -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number - from .base import DEFAULT_CLIENT_INFO, PhoneNumbersTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/async_client.py index 126c268f77d8..0a052950d946 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -45,14 +44,13 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.session_entity_types import pagers from google.cloud.dialogflow_v2beta1.types import entity_type, session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import SessionEntityTypesClient from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport @@ -88,15 +86,9 @@ class SessionEntityTypesAsyncClient: parse_session_entity_type_path = staticmethod( SessionEntityTypesClient.parse_session_entity_type_path ) - common_billing_account_path = staticmethod( - SessionEntityTypesClient.common_billing_account_path - ) - parse_common_billing_account_path = staticmethod( - SessionEntityTypesClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(SessionEntityTypesClient.common_folder_path) - parse_common_folder_path = staticmethod( - SessionEntityTypesClient.parse_common_folder_path + common_project_path = staticmethod(SessionEntityTypesClient.common_project_path) + parse_common_project_path = staticmethod( + SessionEntityTypesClient.parse_common_project_path ) common_organization_path = staticmethod( SessionEntityTypesClient.common_organization_path @@ -104,9 +96,15 @@ class SessionEntityTypesAsyncClient: parse_common_organization_path = staticmethod( SessionEntityTypesClient.parse_common_organization_path ) - common_project_path = staticmethod(SessionEntityTypesClient.common_project_path) - parse_common_project_path = staticmethod( - SessionEntityTypesClient.parse_common_project_path + common_folder_path = staticmethod(SessionEntityTypesClient.common_folder_path) + parse_common_folder_path = staticmethod( + SessionEntityTypesClient.parse_common_folder_path + ) + common_billing_account_path = staticmethod( + SessionEntityTypesClient.common_billing_account_path + ) + parse_common_billing_account_path = staticmethod( + SessionEntityTypesClient.parse_common_billing_account_path ) common_location_path = staticmethod(SessionEntityTypesClient.common_location_path) parse_common_location_path = staticmethod( @@ -364,10 +362,10 @@ async def sample_list_session_entity_types(): Required. The session to list all session entity types from. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, @@ -505,10 +503,10 @@ async def sample_get_session_entity_type(): Required. The name of the session entity type. Supported formats: - - ``projects//agent/sessions//entityTypes/`` - - ``projects//locations//agent/sessions//entityTypes/`` - - ``projects//agent/environments//users//sessions//entityTypes/`` - - ``projects//locations//agent/environments/ /users//sessions//entityTypes/`` + - ``projects//agent/sessions//entityTypes/`` + - ``projects//locations//agent/sessions//entityTypes/`` + - ``projects//agent/environments//users//sessions//entityTypes/`` + - ``projects//locations//agent/environments/ /users//sessions//entityTypes/`` If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, @@ -644,10 +642,10 @@ async def sample_create_session_entity_type(): Required. The session to create a session entity type for. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, @@ -925,10 +923,10 @@ async def sample_delete_session_entity_type(): Required. The name of the entity type to delete. Supported formats: - - ``projects//agent/sessions//entityTypes/`` - - ``projects//locations//agent/sessions//entityTypes/`` - - ``projects//agent/environments//users//sessions//entityTypes/`` - - ``projects//locations//agent/environments/ /users//sessions//entityTypes/`` + - ``projects//agent/sessions//entityTypes/`` + - ``projects//locations//agent/sessions//entityTypes/`` + - ``projects//agent/environments//users//sessions//entityTypes/`` + - ``projects//locations//agent/environments/ /users//sessions//entityTypes/`` If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/client.py index c0796d6a74ed..a6d09b19ee2b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -62,14 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.session_entity_types import pagers from google.cloud.dialogflow_v2beta1.types import entity_type, session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .transports.grpc import SessionEntityTypesGrpcTransport @@ -793,10 +791,10 @@ def sample_list_session_entity_types(): Required. The session to list all session entity types from. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, @@ -933,10 +931,10 @@ def sample_get_session_entity_type(): Required. The name of the session entity type. Supported formats: - - ``projects//agent/sessions//entityTypes/`` - - ``projects//locations//agent/sessions//entityTypes/`` - - ``projects//agent/environments//users//sessions//entityTypes/`` - - ``projects//locations//agent/environments/ /users//sessions//entityTypes/`` + - ``projects//agent/sessions//entityTypes/`` + - ``projects//locations//agent/sessions//entityTypes/`` + - ``projects//agent/environments//users//sessions//entityTypes/`` + - ``projects//locations//agent/environments/ /users//sessions//entityTypes/`` If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, @@ -1069,10 +1067,10 @@ def sample_create_session_entity_type(): Required. The session to create a session entity type for. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, @@ -1348,10 +1346,10 @@ def sample_delete_session_entity_type(): Required. The name of the entity type to delete. Supported formats: - - ``projects//agent/sessions//entityTypes/`` - - ``projects//locations//agent/sessions//entityTypes/`` - - ``projects//agent/environments//users//sessions//entityTypes/`` - - ``projects//locations//agent/environments/ /users//sessions//entityTypes/`` + - ``projects//agent/sessions//entityTypes/`` + - ``projects//locations//agent/sessions//entityTypes/`` + - ``projects//agent/environments//users//sessions//entityTypes/`` + - ``projects//locations//agent/environments/ /users//sessions//entityTypes/`` If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/base.py index 0437878f6d46..f79263df7134 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/base.py @@ -24,15 +24,14 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc.py index f31964bf0004..dcc19c237536 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc.py @@ -27,14 +27,13 @@ from google.api_core import gapic_v1, grpc_helpers 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 - from google.cloud.dialogflow_v2beta1.types import session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc_asyncio.py index d9e692885194..d563b963980c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc_asyncio.py @@ -29,15 +29,14 @@ 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 -from grpc.experimental import aio # type: ignore - from google.cloud.dialogflow_v2beta1.types import session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from grpc.experimental import aio # type: ignore from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .grpc import SessionEntityTypesGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest.py index 3a16cc1d5ab7..b5566b37a435 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest.py @@ -26,15 +26,14 @@ 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.protobuf import json_format -from requests import __version__ as requests_version - from google.cloud.dialogflow_v2beta1.types import session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import json_format +from requests import __version__ as requests_version from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSessionEntityTypesRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest_base.py index 93c0841e6377..b5d0b810b3ef 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest_base.py @@ -19,14 +19,13 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore 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.dialogflow_v2beta1.types import session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import json_format from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/async_client.py index d8448dc4a8c9..877a6ba11be1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/async_client.py @@ -38,9 +38,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -48,11 +47,10 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.types import audio_config, session from google.cloud.dialogflow_v2beta1.types import session as gcd_session +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import SessionsClient from .transports.base import DEFAULT_CLIENT_INFO, SessionsTransport @@ -90,28 +88,28 @@ class SessionsAsyncClient: parse_document_path = staticmethod(SessionsClient.parse_document_path) intent_path = staticmethod(SessionsClient.intent_path) parse_intent_path = staticmethod(SessionsClient.parse_intent_path) - phrase_set_path = staticmethod(SessionsClient.phrase_set_path) - parse_phrase_set_path = staticmethod(SessionsClient.parse_phrase_set_path) session_path = staticmethod(SessionsClient.session_path) parse_session_path = staticmethod(SessionsClient.parse_session_path) session_entity_type_path = staticmethod(SessionsClient.session_entity_type_path) parse_session_entity_type_path = staticmethod( SessionsClient.parse_session_entity_type_path ) + phrase_set_path = staticmethod(SessionsClient.phrase_set_path) + parse_phrase_set_path = staticmethod(SessionsClient.parse_phrase_set_path) + common_project_path = staticmethod(SessionsClient.common_project_path) + parse_common_project_path = staticmethod(SessionsClient.parse_common_project_path) + common_organization_path = staticmethod(SessionsClient.common_organization_path) + parse_common_organization_path = staticmethod( + SessionsClient.parse_common_organization_path + ) + common_folder_path = staticmethod(SessionsClient.common_folder_path) + parse_common_folder_path = staticmethod(SessionsClient.parse_common_folder_path) common_billing_account_path = staticmethod( SessionsClient.common_billing_account_path ) parse_common_billing_account_path = staticmethod( SessionsClient.parse_common_billing_account_path ) - common_folder_path = staticmethod(SessionsClient.common_folder_path) - parse_common_folder_path = staticmethod(SessionsClient.parse_common_folder_path) - common_organization_path = staticmethod(SessionsClient.common_organization_path) - parse_common_organization_path = staticmethod( - SessionsClient.parse_common_organization_path - ) - common_project_path = staticmethod(SessionsClient.common_project_path) - parse_common_project_path = staticmethod(SessionsClient.parse_common_project_path) common_location_path = staticmethod(SessionsClient.common_location_path) parse_common_location_path = staticmethod(SessionsClient.parse_common_location_path) @@ -373,10 +371,10 @@ async def sample_detect_intent(): Required. The name of the session this query is sent to. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, @@ -582,12 +580,12 @@ def request_generator(): However, note that: - - Dialogflow will bill you for the audio duration so - far. - - Dialogflow discards all Speech recognition results - in favor of the input text. - - Dialogflow will use the language code from the - first message. + - Dialogflow will bill you for the audio duration so + far. + - Dialogflow discards all Speech recognition results + in favor of the input text. + - Dialogflow will use the language code from the + first message. After you sent all input, you must half-close or abort the request stream. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/client.py index ec093ed01662..917a34fbf7b5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/client.py @@ -45,9 +45,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -64,11 +63,10 @@ _LOGGER = std_logging.getLogger(__name__) import google.rpc.status_pb2 as status_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.types import audio_config, session from google.cloud.dialogflow_v2beta1.types import session as gcd_session +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, SessionsTransport from .transports.grpc import SessionsGrpcTransport @@ -297,28 +295,6 @@ def parse_intent_path(path: str) -> Dict[str, str]: m = re.match(r"^projects/(?P.+?)/agent/intents/(?P.+?)$", path) return m.groupdict() if m else {} - @staticmethod - def phrase_set_path( - project: str, - location: str, - phrase_set: str, - ) -> str: - """Returns a fully-qualified phrase_set string.""" - return "projects/{project}/locations/{location}/phraseSets/{phrase_set}".format( - project=project, - location=location, - phrase_set=phrase_set, - ) - - @staticmethod - def parse_phrase_set_path(path: str) -> Dict[str, str]: - """Parses a phrase_set path into its component segments.""" - m = re.match( - r"^projects/(?P.+?)/locations/(?P.+?)/phraseSets/(?P.+?)$", - path, - ) - return m.groupdict() if m else {} - @staticmethod def session_path( project: str, @@ -360,6 +336,28 @@ def parse_session_entity_type_path(path: str) -> Dict[str, str]: ) return m.groupdict() if m else {} + @staticmethod + def phrase_set_path( + project: str, + location: str, + phrase_set: str, + ) -> str: + """Returns a fully-qualified phrase_set string.""" + return "projects/{project}/locations/{location}/phraseSets/{phrase_set}".format( + project=project, + location=location, + phrase_set=phrase_set, + ) + + @staticmethod + def parse_phrase_set_path(path: str) -> Dict[str, str]: + """Parses a phrase_set path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/phraseSets/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def common_billing_account_path( billing_account: str, @@ -901,10 +899,10 @@ def sample_detect_intent(): Required. The name of the session this query is sent to. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, @@ -1107,12 +1105,12 @@ def request_generator(): However, note that: - - Dialogflow will bill you for the audio duration so - far. - - Dialogflow discards all Speech recognition results - in favor of the input text. - - Dialogflow will use the language code from the - first message. + - Dialogflow will bill you for the audio duration so + far. + - Dialogflow discards all Speech recognition results + in favor of the input text. + - Dialogflow will use the language code from the + first message. After you sent all input, you must half-close or abort the request stream. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/base.py index 29efac0b53c8..8e00e18fde78 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/base.py @@ -23,13 +23,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import session from google.cloud.dialogflow_v2beta1.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.oauth2 import service_account # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc.py index fdab8a3ae719..e377143dd479 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc.py @@ -26,13 +26,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2beta1.types import session +from google.cloud.dialogflow_v2beta1.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.json_format import MessageToJson -from google.cloud.dialogflow_v2beta1.types import session -from google.cloud.dialogflow_v2beta1.types import session as gcd_session - from .base import DEFAULT_CLIENT_INFO, SessionsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc_asyncio.py index 3fde1e92fea4..c969e5da48fd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc_asyncio.py @@ -28,14 +28,13 @@ 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.dialogflow_v2beta1.types import session +from google.cloud.dialogflow_v2beta1.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.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2beta1.types import session -from google.cloud.dialogflow_v2beta1.types import session as gcd_session - from .base import DEFAULT_CLIENT_INFO, SessionsTransport from .grpc import SessionsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/rest.py index 20002afde004..1a60fd06734d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/rest.py @@ -25,14 +25,13 @@ 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.dialogflow_v2beta1.types import session +from google.cloud.dialogflow_v2beta1.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 json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import session -from google.cloud.dialogflow_v2beta1.types import session as gcd_session - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSessionsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/rest_base.py index b76f39b61b5d..a0e39a495443 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/rest_base.py @@ -18,13 +18,12 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2beta1.types import session +from google.cloud.dialogflow_v2beta1.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 json_format -from google.cloud.dialogflow_v2beta1.types import session -from google.cloud.dialogflow_v2beta1.types import session as gcd_session - from .base import DEFAULT_CLIENT_INFO, SessionsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/async_client.py index d7c2a2a77dc4..1ba25e2f2427 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -45,12 +44,11 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.sip_trunks import pagers from google.cloud.dialogflow_v2beta1.types import sip_trunk from google.cloud.dialogflow_v2beta1.types import sip_trunk as gcd_sip_trunk +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import SipTrunksClient from .transports.base import DEFAULT_CLIENT_INFO, SipTrunksTransport @@ -82,20 +80,20 @@ class SipTrunksAsyncClient: sip_trunk_path = staticmethod(SipTrunksClient.sip_trunk_path) parse_sip_trunk_path = staticmethod(SipTrunksClient.parse_sip_trunk_path) + common_project_path = staticmethod(SipTrunksClient.common_project_path) + parse_common_project_path = staticmethod(SipTrunksClient.parse_common_project_path) + common_organization_path = staticmethod(SipTrunksClient.common_organization_path) + parse_common_organization_path = staticmethod( + SipTrunksClient.parse_common_organization_path + ) + common_folder_path = staticmethod(SipTrunksClient.common_folder_path) + parse_common_folder_path = staticmethod(SipTrunksClient.parse_common_folder_path) common_billing_account_path = staticmethod( SipTrunksClient.common_billing_account_path ) parse_common_billing_account_path = staticmethod( SipTrunksClient.parse_common_billing_account_path ) - common_folder_path = staticmethod(SipTrunksClient.common_folder_path) - parse_common_folder_path = staticmethod(SipTrunksClient.parse_common_folder_path) - common_organization_path = staticmethod(SipTrunksClient.common_organization_path) - parse_common_organization_path = staticmethod( - SipTrunksClient.parse_common_organization_path - ) - common_project_path = staticmethod(SipTrunksClient.common_project_path) - parse_common_project_path = staticmethod(SipTrunksClient.parse_common_project_path) common_location_path = staticmethod(SipTrunksClient.common_location_path) parse_common_location_path = staticmethod( SipTrunksClient.parse_common_location_path diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/client.py index a63c56b84221..96dc79f21c32 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -62,12 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.sip_trunks import pagers from google.cloud.dialogflow_v2beta1.types import sip_trunk from google.cloud.dialogflow_v2beta1.types import sip_trunk as gcd_sip_trunk +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, SipTrunksTransport from .transports.grpc import SipTrunksGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/base.py index 963889c81329..89cde82e8a48 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/base.py @@ -24,13 +24,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import sip_trunk from google.cloud.dialogflow_v2beta1.types import sip_trunk as gcd_sip_trunk +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc.py index 600ae9bcffd0..fedea0491531 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc.py @@ -27,13 +27,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2beta1.types import sip_trunk +from google.cloud.dialogflow_v2beta1.types import sip_trunk as gcd_sip_trunk from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2beta1.types import sip_trunk -from google.cloud.dialogflow_v2beta1.types import sip_trunk as gcd_sip_trunk - from .base import DEFAULT_CLIENT_INFO, SipTrunksTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc_asyncio.py index 22f76bcb0418..b6e18cf082fb 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc_asyncio.py @@ -29,14 +29,13 @@ 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.dialogflow_v2beta1.types import sip_trunk +from google.cloud.dialogflow_v2beta1.types import sip_trunk as gcd_sip_trunk from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2beta1.types import sip_trunk -from google.cloud.dialogflow_v2beta1.types import sip_trunk as gcd_sip_trunk - from .base import DEFAULT_CLIENT_INFO, SipTrunksTransport from .grpc import SipTrunksGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest.py index a032a2f3fb5b..9d3c00d2aecc 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest.py @@ -26,14 +26,13 @@ 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.dialogflow_v2beta1.types import sip_trunk +from google.cloud.dialogflow_v2beta1.types import sip_trunk as gcd_sip_trunk from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import sip_trunk -from google.cloud.dialogflow_v2beta1.types import sip_trunk as gcd_sip_trunk - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSipTrunksRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest_base.py index b215c29c9481..aa6913517811 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest_base.py @@ -19,13 +19,12 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2beta1.types import sip_trunk +from google.cloud.dialogflow_v2beta1.types import sip_trunk as gcd_sip_trunk 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.dialogflow_v2beta1.types import sip_trunk -from google.cloud.dialogflow_v2beta1.types import sip_trunk as gcd_sip_trunk - from .base import DEFAULT_CLIENT_INFO, SipTrunksTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/async_client.py index 786a3c1eb50a..6b5167848463 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,12 +45,11 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.tools import pagers from google.cloud.dialogflow_v2beta1.types import tool from google.cloud.dialogflow_v2beta1.types import tool as gcd_tool +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import ToolsClient from .transports.base import DEFAULT_CLIENT_INFO, ToolsTransport @@ -82,24 +80,24 @@ class ToolsAsyncClient: _DEFAULT_ENDPOINT_TEMPLATE = ToolsClient._DEFAULT_ENDPOINT_TEMPLATE _DEFAULT_UNIVERSE = ToolsClient._DEFAULT_UNIVERSE + tool_path = staticmethod(ToolsClient.tool_path) + parse_tool_path = staticmethod(ToolsClient.parse_tool_path) secret_version_path = staticmethod(ToolsClient.secret_version_path) parse_secret_version_path = staticmethod(ToolsClient.parse_secret_version_path) service_path = staticmethod(ToolsClient.service_path) parse_service_path = staticmethod(ToolsClient.parse_service_path) - tool_path = staticmethod(ToolsClient.tool_path) - parse_tool_path = staticmethod(ToolsClient.parse_tool_path) - common_billing_account_path = staticmethod(ToolsClient.common_billing_account_path) - parse_common_billing_account_path = staticmethod( - ToolsClient.parse_common_billing_account_path - ) - common_folder_path = staticmethod(ToolsClient.common_folder_path) - parse_common_folder_path = staticmethod(ToolsClient.parse_common_folder_path) + common_project_path = staticmethod(ToolsClient.common_project_path) + parse_common_project_path = staticmethod(ToolsClient.parse_common_project_path) common_organization_path = staticmethod(ToolsClient.common_organization_path) parse_common_organization_path = staticmethod( ToolsClient.parse_common_organization_path ) - common_project_path = staticmethod(ToolsClient.common_project_path) - parse_common_project_path = staticmethod(ToolsClient.parse_common_project_path) + common_folder_path = staticmethod(ToolsClient.common_folder_path) + parse_common_folder_path = staticmethod(ToolsClient.parse_common_folder_path) + common_billing_account_path = staticmethod(ToolsClient.common_billing_account_path) + parse_common_billing_account_path = staticmethod( + ToolsClient.parse_common_billing_account_path + ) common_location_path = staticmethod(ToolsClient.common_location_path) parse_common_location_path = staticmethod(ToolsClient.parse_common_location_path) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/client.py index 96f089811161..bedc61bd5b28 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -63,12 +62,11 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.tools import pagers from google.cloud.dialogflow_v2beta1.types import tool from google.cloud.dialogflow_v2beta1.types import tool as gcd_tool +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, ToolsTransport from .transports.grpc import ToolsGrpcTransport @@ -235,6 +233,28 @@ def transport(self) -> ToolsTransport: """ return self._transport + @staticmethod + def tool_path( + project: str, + location: str, + tool: str, + ) -> str: + """Returns a fully-qualified tool string.""" + return "projects/{project}/locations/{location}/tools/{tool}".format( + project=project, + location=location, + tool=tool, + ) + + @staticmethod + def parse_tool_path(path: str) -> Dict[str, str]: + """Parses a tool path into its component segments.""" + m = re.match( + r"^projects/(?P.+?)/locations/(?P.+?)/tools/(?P.+?)$", + path, + ) + return m.groupdict() if m else {} + @staticmethod def secret_version_path( project: str, @@ -281,28 +301,6 @@ def parse_service_path(path: str) -> Dict[str, str]: ) return m.groupdict() if m else {} - @staticmethod - def tool_path( - project: str, - location: str, - tool: str, - ) -> str: - """Returns a fully-qualified tool string.""" - return "projects/{project}/locations/{location}/tools/{tool}".format( - project=project, - location=location, - tool=tool, - ) - - @staticmethod - def parse_tool_path(path: str) -> Dict[str, str]: - """Parses a tool path into its component segments.""" - m = re.match( - r"^projects/(?P.+?)/locations/(?P.+?)/tools/(?P.+?)$", - path, - ) - return m.groupdict() if m else {} - @staticmethod def common_billing_account_path( billing_account: str, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/base.py index e2448935bbae..a3bbe74225af 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/base.py @@ -24,13 +24,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import tool from google.cloud.dialogflow_v2beta1.types import tool as gcd_tool +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc.py index 77d27cecb33b..78c31571a817 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc.py @@ -27,13 +27,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2beta1.types import tool +from google.cloud.dialogflow_v2beta1.types import tool as gcd_tool from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2beta1.types import tool -from google.cloud.dialogflow_v2beta1.types import tool as gcd_tool - from .base import DEFAULT_CLIENT_INFO, ToolsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc_asyncio.py index 4b1ec5ffc72e..6f3f84080cf7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc_asyncio.py @@ -29,14 +29,13 @@ 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.dialogflow_v2beta1.types import tool +from google.cloud.dialogflow_v2beta1.types import tool as gcd_tool from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2beta1.types import tool -from google.cloud.dialogflow_v2beta1.types import tool as gcd_tool - from .base import DEFAULT_CLIENT_INFO, ToolsTransport from .grpc import ToolsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest.py index 89dd2217936b..49708b0c4fe3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest.py @@ -26,14 +26,13 @@ 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.dialogflow_v2beta1.types import tool +from google.cloud.dialogflow_v2beta1.types import tool as gcd_tool from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import tool -from google.cloud.dialogflow_v2beta1.types import tool as gcd_tool - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseToolsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest_base.py index afee8f9bd9f2..d60459ef4bc7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest_base.py @@ -19,13 +19,12 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2beta1.types import tool +from google.cloud.dialogflow_v2beta1.types import tool as gcd_tool 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.dialogflow_v2beta1.types import tool -from google.cloud.dialogflow_v2beta1.types import tool as gcd_tool - from .base import DEFAULT_CLIENT_INFO, ToolsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/async_client.py index 4ddfdb1a894d..840fd93c94ea 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/async_client.py @@ -35,9 +35,8 @@ 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 - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,12 +45,11 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.versions import pagers from google.cloud.dialogflow_v2beta1.types import version from google.cloud.dialogflow_v2beta1.types import version as gcd_version +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .client import VersionsClient from .transports.base import DEFAULT_CLIENT_INFO, VersionsTransport @@ -83,20 +81,20 @@ class VersionsAsyncClient: version_path = staticmethod(VersionsClient.version_path) parse_version_path = staticmethod(VersionsClient.parse_version_path) + common_project_path = staticmethod(VersionsClient.common_project_path) + parse_common_project_path = staticmethod(VersionsClient.parse_common_project_path) + common_organization_path = staticmethod(VersionsClient.common_organization_path) + parse_common_organization_path = staticmethod( + VersionsClient.parse_common_organization_path + ) + common_folder_path = staticmethod(VersionsClient.common_folder_path) + parse_common_folder_path = staticmethod(VersionsClient.parse_common_folder_path) common_billing_account_path = staticmethod( VersionsClient.common_billing_account_path ) parse_common_billing_account_path = staticmethod( VersionsClient.parse_common_billing_account_path ) - common_folder_path = staticmethod(VersionsClient.common_folder_path) - parse_common_folder_path = staticmethod(VersionsClient.parse_common_folder_path) - common_organization_path = staticmethod(VersionsClient.common_organization_path) - parse_common_organization_path = staticmethod( - VersionsClient.parse_common_organization_path - ) - common_project_path = staticmethod(VersionsClient.common_project_path) - parse_common_project_path = staticmethod(VersionsClient.parse_common_project_path) common_location_path = staticmethod(VersionsClient.common_location_path) parse_common_location_path = staticmethod(VersionsClient.parse_common_location_path) @@ -340,8 +338,8 @@ async def sample_list_versions(): Required. The agent to list all versions from. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -467,8 +465,8 @@ async def sample_get_version(): name (:class:`str`): Required. The name of the version. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` This corresponds to the ``name`` field on the ``request`` instance; if ``request`` is provided, this @@ -496,10 +494,10 @@ async def sample_get_version(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -604,8 +602,8 @@ async def sample_create_version(): Required. The agent to create a version for. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -638,10 +636,10 @@ async def sample_create_version(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -748,8 +746,8 @@ async def sample_update_version(): version (:class:`google.cloud.dialogflow_v2beta1.types.Version`): Required. The version to update. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` This corresponds to the ``version`` field on the ``request`` instance; if ``request`` is provided, this @@ -784,10 +782,10 @@ async def sample_update_version(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -889,8 +887,8 @@ async def sample_delete_version(): Required. The name of the version to delete. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` This corresponds to the ``name`` field on the ``request`` instance; if ``request`` is provided, this diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/client.py index 26092ac7630b..40babeff4fcc 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/client.py @@ -43,9 +43,8 @@ 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.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.oauth2 import service_account # type: ignore try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -63,12 +62,11 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.dialogflow_v2beta1.services.versions import pagers from google.cloud.dialogflow_v2beta1.types import version from google.cloud.dialogflow_v2beta1.types import version as gcd_version +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from .transports.base import DEFAULT_CLIENT_INFO, VersionsTransport from .transports.grpc import VersionsGrpcTransport @@ -776,8 +774,8 @@ def sample_list_versions(): Required. The agent to list all versions from. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -900,8 +898,8 @@ def sample_get_version(): name (str): Required. The name of the version. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` This corresponds to the ``name`` field on the ``request`` instance; if ``request`` is provided, this @@ -929,10 +927,10 @@ def sample_get_version(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -1034,8 +1032,8 @@ def sample_create_version(): Required. The agent to create a version for. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` This corresponds to the ``parent`` field on the ``request`` instance; if ``request`` is provided, this @@ -1068,10 +1066,10 @@ def sample_create_version(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -1175,8 +1173,8 @@ def sample_update_version(): version (google.cloud.dialogflow_v2beta1.types.Version): Required. The version to update. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` This corresponds to the ``version`` field on the ``request`` instance; if ``request`` is provided, this @@ -1211,10 +1209,10 @@ def sample_update_version(): you can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the [versions and environments @@ -1313,8 +1311,8 @@ def sample_delete_version(): Required. The name of the version to delete. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` This corresponds to the ``name`` field on the ``request`` instance; if ``request`` is provided, this diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/base.py index ca78ff295fd0..be283a01756f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/base.py @@ -24,13 +24,12 @@ 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.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore - from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import version from google.cloud.dialogflow_v2beta1.types import version as gcd_version +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 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc.py index dc6c99dabff0..420c03aa2d7f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc.py @@ -27,13 +27,12 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.dialogflow_v2beta1.types import version +from google.cloud.dialogflow_v2beta1.types import version as gcd_version from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -from google.cloud.dialogflow_v2beta1.types import version -from google.cloud.dialogflow_v2beta1.types import version as gcd_version - from .base import DEFAULT_CLIENT_INFO, VersionsTransport try: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc_asyncio.py index 3105094d98c4..585af5bb907d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc_asyncio.py @@ -29,14 +29,13 @@ 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.dialogflow_v2beta1.types import version +from google.cloud.dialogflow_v2beta1.types import version as gcd_version from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore -from google.cloud.dialogflow_v2beta1.types import version -from google.cloud.dialogflow_v2beta1.types import version as gcd_version - from .base import DEFAULT_CLIENT_INFO, VersionsTransport from .grpc import VersionsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest.py index b37558987ee9..a7d695567c34 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest.py @@ -26,14 +26,13 @@ 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.dialogflow_v2beta1.types import version +from google.cloud.dialogflow_v2beta1.types import version as gcd_version from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import version -from google.cloud.dialogflow_v2beta1.types import version as gcd_version - from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseVersionsRestTransport @@ -595,10 +594,10 @@ def __call__( can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the `versions and environments guide `__. @@ -877,10 +876,10 @@ def __call__( can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the `versions and environments guide `__. @@ -1195,10 +1194,10 @@ def __call__( can publish them to custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the `versions and environments guide `__. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest_base.py index e7aa10a1a88f..1989f45aa973 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest_base.py @@ -19,13 +19,12 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template +from google.cloud.dialogflow_v2beta1.types import version +from google.cloud.dialogflow_v2beta1.types import version as gcd_version 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.dialogflow_v2beta1.types import version -from google.cloud.dialogflow_v2beta1.types import version as gcd_version - from .base import DEFAULT_CLIENT_INFO, VersionsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/__init__.py index 9c9969e82f7f..819e5212d21c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/__init__.py @@ -58,6 +58,12 @@ TelephonyDtmfEvents, VoiceSelectionParams, ) +from .ces_app import ( + CesAppSpec, +) +from .ces_tool import ( + CesToolSpec, +) from .context import ( Context, CreateContextRequest, @@ -89,6 +95,7 @@ ListMessagesRequest, ListMessagesResponse, SearchKnowledgeAnswer, + SearchKnowledgeDebugInfo, SearchKnowledgeRequest, SearchKnowledgeResponse, SuggestConversationSummaryRequest, @@ -253,15 +260,18 @@ CompileSuggestionRequest, CompileSuggestionResponse, CreateParticipantRequest, + DatastoreResponseReason, DialogflowAssistAnswer, DtmfParameters, FaqAnswer, GenerateSuggestionsResponse, GetParticipantRequest, + IngestedContextReferenceDebugInfo, InputTextConfig, IntentInput, IntentSuggestion, KnowledgeAssistAnswer, + KnowledgeAssistDebugInfo, ListParticipantsRequest, ListParticipantsResponse, ListSuggestionsRequest, @@ -271,6 +281,7 @@ OutputAudio, Participant, ResponseMessage, + ServiceLatency, SmartReplyAnswer, StreamingAnalyzeContentRequest, StreamingAnalyzeContentResponse, @@ -346,6 +357,9 @@ ToolCall, ToolCallResult, ) +from .toolset import ( + ToolsetTool, +) from .validation_result import ( ValidationError, ValidationResult, @@ -403,6 +417,8 @@ "SpeechModelVariant", "SsmlVoiceGender", "TelephonyDtmf", + "CesAppSpec", + "CesToolSpec", "Context", "CreateContextRequest", "DeleteAllContextsRequest", @@ -431,6 +447,7 @@ "ListMessagesRequest", "ListMessagesResponse", "SearchKnowledgeAnswer", + "SearchKnowledgeDebugInfo", "SearchKnowledgeRequest", "SearchKnowledgeResponse", "SuggestConversationSummaryRequest", @@ -570,10 +587,12 @@ "FaqAnswer", "GenerateSuggestionsResponse", "GetParticipantRequest", + "IngestedContextReferenceDebugInfo", "InputTextConfig", "IntentInput", "IntentSuggestion", "KnowledgeAssistAnswer", + "KnowledgeAssistDebugInfo", "ListParticipantsRequest", "ListParticipantsResponse", "ListSuggestionsRequest", @@ -583,6 +602,7 @@ "OutputAudio", "Participant", "ResponseMessage", + "ServiceLatency", "SmartReplyAnswer", "StreamingAnalyzeContentRequest", "StreamingAnalyzeContentResponse", @@ -600,6 +620,7 @@ "SuggestSmartRepliesRequest", "SuggestSmartRepliesResponse", "UpdateParticipantRequest", + "DatastoreResponseReason", "DeletePhoneNumberRequest", "ListPhoneNumbersRequest", "ListPhoneNumbersResponse", @@ -645,6 +666,7 @@ "UpdateToolRequest", "ToolCall", "ToolCallResult", + "ToolsetTool", "ValidationError", "ValidationResult", "CreateVersionRequest", diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/answer_record.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/answer_record.py index dfc759114ade..191ce6139f12 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/answer_record.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/answer_record.py @@ -20,7 +20,6 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2beta1.types import generator, participant __protobuf__ = proto.module( @@ -44,13 +43,13 @@ class AnswerRecord(proto.Message): Currently, answer record includes: - - human agent assistant article suggestion - - human agent assistant faq article + - human agent assistant article suggestion + - human agent assistant faq article It doesn't include: - - ``DetectIntent`` intent matching - - ``DetectIntent`` knowledge + - ``DetectIntent`` intent matching + - ``DetectIntent`` knowledge Answer records are not related to the conversation history in the Dialogflow Console. A Record is generated even when the end-user @@ -251,23 +250,24 @@ class AgentAssistantFeedback(proto.Message): For example: - - Query: "Can I change my mailing address?" - - Suggested document says: "Items must be returned/exchanged - within 60 days of the purchase date." - - [answer_relevance][google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.answer_relevance]: - [AnswerRelevance.IRRELEVANT][google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.AnswerRelevance.IRRELEVANT] + - Query: "Can I change my mailing address?" + - Suggested document says: "Items must be + returned/exchanged within 60 days of the purchase date." + - [answer_relevance][google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.answer_relevance]: + [AnswerRelevance.IRRELEVANT][google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.AnswerRelevance.IRRELEVANT] document_correctness (google.cloud.dialogflow_v2beta1.types.AgentAssistantFeedback.DocumentCorrectness): Optional. Whether or not the information in the document is correct. For example: - - Query: "Can I return the package in 2 days once received?" - - Suggested document says: "Items must be returned/exchanged - within 60 days of the purchase date." - - Ground truth: "No return or exchange is allowed." - - [document_correctness][google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.document_correctness]: - [INCORRECT][google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentCorrectness.INCORRECT] + - Query: "Can I return the package in 2 days once + received?" + - Suggested document says: "Items must be + returned/exchanged within 60 days of the purchase date." + - Ground truth: "No return or exchange is allowed." + - [document_correctness][google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.document_correctness]: + [INCORRECT][google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentCorrectness.INCORRECT] document_efficiency (google.cloud.dialogflow_v2beta1.types.AgentAssistantFeedback.DocumentEfficiency): Optional. Whether or not the suggested document is efficient. For example, if the document is poorly written, @@ -486,14 +486,14 @@ class ListAnswerRecordsRequest(proto.Message): The following fields and operators are supported: - - conversation_id with equals(=) operator + - conversation_id with equals(=) operator Examples: - - "conversation_id=bar" matches answer records in the - projects/foo/locations/global/conversations/bar - conversation (assuming the parent is - projects/foo/locations/global). + - "conversation_id=bar" matches answer records in the + projects/foo/locations/global/conversations/bar + conversation (assuming the parent is + projects/foo/locations/global). For more information about filtering, see `API Filtering `__. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/audio_config.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/audio_config.py index df82fee676b0..e239dd7f394c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/audio_config.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/audio_config.py @@ -201,19 +201,19 @@ class SpeechModelVariant(proto.Enum): USE_ENHANCED (3): Use an enhanced model variant: - - If an enhanced variant does not exist for the given - [model][google.cloud.dialogflow.v2beta1.InputAudioConfig.model] - and request language, Dialogflow falls back to the - standard variant. - - The `Cloud Speech - documentation `__ - describes which models have enhanced variants. - - - If the API caller isn't eligible for enhanced models, - Dialogflow returns an error. Please see the `Dialogflow - docs `__ - for how to make your project eligible. + - If an enhanced variant does not exist for the given + [model][google.cloud.dialogflow.v2beta1.InputAudioConfig.model] + and request language, Dialogflow falls back to the + standard variant. + + The `Cloud Speech + documentation `__ + describes which models have enhanced variants. + + - If the API caller isn't eligible for enhanced models, + Dialogflow returns an error. Please see the `Dialogflow + docs `__ + for how to make your project eligible. """ SPEECH_MODEL_VARIANT_UNSPECIFIED = 0 @@ -295,10 +295,11 @@ class SpeechContext(proto.Message): This list can be used to: - - improve accuracy for words and phrases you expect the user - to say, e.g. typical commands for your Dialogflow agent - - add additional words to the speech recognizer vocabulary - - ... + - improve accuracy for words and phrases you expect the + user to say, e.g. typical commands for your Dialogflow + agent + - add additional words to the speech recognizer vocabulary + - ... See the `Cloud Speech documentation `__ @@ -306,11 +307,11 @@ class SpeechContext(proto.Message): boost (float): Optional. Boost for this context compared to other contexts: - - If the boost is positive, Dialogflow will increase the - probability that the phrases in this context are - recognized over similar sounding phrases. - - If the boost is unspecified or non-positive, Dialogflow - will not apply any boost. + - If the boost is positive, Dialogflow will increase the + probability that the phrases in this context are + recognized over similar sounding phrases. + - If the boost is unspecified or non-positive, Dialogflow + will not apply any boost. Dialogflow recommends that you use boosts in the range (0, 20] and that you find a value that fits your use case with @@ -388,13 +389,13 @@ class BargeInConfig(proto.Message): input as soon as it starts playing back the audio from the previous response. The playback is modeled into two phases: - - No barge-in phase: which goes first and during which speech - detection should not be carried out. + - No barge-in phase: which goes first and during which speech + detection should not be carried out. - - Barge-in phase: which follows the no barge-in phase and during - which the API starts speech detection and may inform the client - that an utterance has been detected. Note that no-speech event is - not expected in this phase. + - Barge-in phase: which follows the no barge-in phase and during + which the API starts speech detection and may inform the client + that an utterance has been detected. Note that no-speech event is + not expected in this phase. The client provides this configuration in terms of the durations of those two phases. The durations are measured in terms of the audio @@ -834,9 +835,9 @@ class SpeechToTextConfig(proto.Message): for more details. If you specify a model, the following models typically have the best performance: - - phone_call (best for Agent Assist and telephony) - - latest_short (best for Dialogflow non-telephony) - - command_and_search + - phone_call (best for Agent Assist and telephony) + - latest_short (best for Dialogflow non-telephony) + - command_and_search Leave this field unspecified to use `Agent Speech settings `__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/ces_app.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/ces_app.py new file mode 100644 index 000000000000..b0271677d480 --- /dev/null +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/ces_app.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +from __future__ import annotations + +from typing import MutableMapping, MutableSequence + +import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import tool + +__protobuf__ = proto.module( + package="google.cloud.dialogflow.v2beta1", + manifest={ + "CesAppSpec", + }, +) + + +class CesAppSpec(proto.Message): + r"""Spec of CES app that the generator can choose from. + + Attributes: + ces_app (str): + Optional. Format: + ``projects//locations//apps/``. + confirmation_requirement (google.cloud.dialogflow_v2beta1.types.Tool.ConfirmationRequirement): + Optional. Indicates whether the app requires + human confirmation. + """ + + ces_app: str = proto.Field( + proto.STRING, + number=1, + ) + confirmation_requirement: tool.Tool.ConfirmationRequirement = proto.Field( + proto.ENUM, + number=2, + enum=tool.Tool.ConfirmationRequirement, + ) + + +__all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/ces_tool.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/ces_tool.py new file mode 100644 index 000000000000..24bc642fe0ce --- /dev/null +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/ces_tool.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +from __future__ import annotations + +from typing import MutableMapping, MutableSequence + +import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import tool + +__protobuf__ = proto.module( + package="google.cloud.dialogflow.v2beta1", + manifest={ + "CesToolSpec", + }, +) + + +class CesToolSpec(proto.Message): + r"""Spec of CES tool that the generator can choose from. + + Attributes: + ces_tool (str): + Optional. Format: + ``projects//locations//apps//tools/``. + confirmation_requirement (google.cloud.dialogflow_v2beta1.types.Tool.ConfirmationRequirement): + Optional. Indicates whether the tool requires + human confirmation. + """ + + ces_tool: str = proto.Field( + proto.STRING, + number=1, + ) + confirmation_requirement: tool.Tool.ConfirmationRequirement = proto.Field( + proto.ENUM, + number=2, + enum=tool.Tool.ConfirmationRequirement, + ) + + +__all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/context.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/context.py index a8704308d078..34b612a15d4c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/context.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/context.py @@ -59,10 +59,10 @@ class Context(proto.Message): Required. The unique identifier of the context. Supported formats: - - ``projects//agent/sessions//contexts/``, - - ``projects//locations//agent/sessions//contexts/``, - - ``projects//agent/environments//users//sessions//contexts/``, - - ``projects//locations//agent/environments//users//sessions//contexts/``, + - ``projects//agent/sessions//contexts/``, + - ``projects//locations//agent/sessions//contexts/``, + - ``projects//agent/environments//users//sessions//contexts/``, + - ``projects//locations//agent/environments//users//sessions//contexts/``, The ``Context ID`` is always converted to lowercase, may only contain characters in ``a-zA-Z0-9_-%`` and may be at @@ -76,9 +76,9 @@ class Context(proto.Message): Dialogflow. You should not use these contexts or create contexts with these names: - - ``__system_counters__`` - - ``*_id_dialog_context`` - - ``*_dialog_params_size`` + - ``__system_counters__`` + - ``*_id_dialog_context`` + - ``*_dialog_params_size`` lifespan_count (int): Optional. The number of conversational query requests after which the context expires. The default is ``0``. If set to @@ -94,15 +94,15 @@ class Context(proto.Message): JSON object composed of a collection of (MapKey, MapValue) pairs: - - MapKey type: string - - MapKey value: parameter name - - MapValue type: If parameter's entity type is a composite - entity then use map, otherwise, depending on the parameter - value type, it could be one of string, number, boolean, - null, list or map. - - MapValue value: If parameter's entity type is a composite - entity then use map from composite entity property names - to property values, otherwise, use parameter value. + - MapKey type: string + - MapKey value: parameter name + - MapValue type: If parameter's entity type is a composite + entity then use map, otherwise, depending on the + parameter value type, it could be one of string, number, + boolean, null, list or map. + - MapValue value: If parameter's entity type is a composite + entity then use map from composite entity property names + to property values, otherwise, use parameter value. """ name: str = proto.Field( @@ -129,10 +129,10 @@ class ListContextsRequest(proto.Message): Required. The session to list all contexts from. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, we assume @@ -198,10 +198,10 @@ class GetContextRequest(proto.Message): name (str): Required. The name of the context. Supported formats: - - ``projects//agent/sessions//contexts/``, - - ``projects//locations//agent/sessions//contexts/``, - - ``projects//agent/environments//users//sessions//contexts/``, - - ``projects//locations//agent/environments//users//sessions//contexts/``, + - ``projects//agent/sessions//contexts/``, + - ``projects//locations//agent/sessions//contexts/``, + - ``projects//agent/environments//users//sessions//contexts/``, + - ``projects//locations//agent/environments//users//sessions//contexts/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, we assume @@ -224,10 +224,10 @@ class CreateContextRequest(proto.Message): Required. The session to create a context for. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, we assume @@ -281,10 +281,10 @@ class DeleteContextRequest(proto.Message): Required. The name of the context to delete. Supported formats: - - ``projects//agent/sessions//contexts/``, - - ``projects//locations//agent/sessions//contexts/``, - - ``projects//agent/environments//users//sessions//contexts/``, - - ``projects//locations//agent/environments//users//sessions//contexts/``, + - ``projects//agent/sessions//contexts/``, + - ``projects//locations//agent/sessions//contexts/``, + - ``projects//agent/environments//users//sessions//contexts/``, + - ``projects//locations//agent/environments//users//sessions//contexts/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, we assume @@ -307,10 +307,10 @@ class DeleteAllContextsRequest(proto.Message): Required. The name of the session to delete all contexts from. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified we assume diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation.py index 732f0e10aa84..e5ed9c836f48 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation.py @@ -20,7 +20,6 @@ import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) @@ -51,6 +50,7 @@ "GenerateStatelessSuggestionRequest", "GenerateStatelessSuggestionResponse", "SearchKnowledgeRequest", + "SearchKnowledgeDebugInfo", "SearchKnowledgeResponse", "SearchKnowledgeAnswer", "GenerateSuggestionsRequest", @@ -108,9 +108,18 @@ class Conversation(proto.Message): telephony_connection_info (google.cloud.dialogflow_v2beta1.types.Conversation.TelephonyConnectionInfo): Output only. The telephony connection information. + initial_conversation_profile (google.cloud.dialogflow_v2beta1.types.ConversationProfile): + Optional. Output only. The initial + conversation profile to be used to configure + this conversation, which is a copy of the + conversation profile config read at conversation + creation time. ingested_context_references (MutableMapping[str, google.cloud.dialogflow_v2beta1.types.Conversation.ContextReference]): Output only. The context reference updates provided by external systems. + initial_generator_contexts (MutableMapping[str, google.cloud.dialogflow_v2beta1.types.Conversation.GeneratorContext]): + Output only. A map with generator name as key + and generator context as value. """ class LifecycleState(proto.Enum): @@ -347,6 +356,48 @@ class ContentFormat(proto.Enum): message=timestamp_pb2.Timestamp, ) + class GeneratorContext(proto.Message): + r"""Represents the context of a generator. + + Attributes: + generator_type (google.cloud.dialogflow_v2beta1.types.Conversation.GeneratorContext.GeneratorType): + Output only. The type of the generator. + """ + + class GeneratorType(proto.Enum): + r"""The available generator types. + + Values: + GENERATOR_TYPE_UNSPECIFIED (0): + Unspecified generator type. + FREE_FORM (1): + Free form generator type. + AGENT_COACHING (2): + Agent coaching generator type. + SUMMARIZATION (3): + Summarization generator type. + TRANSLATION (4): + Translation generator type. + AGENT_FEEDBACK (5): + Agent feedback generator type. + CUSTOMER_MESSAGE_GENERATION (6): + Customer message generation generator type. + """ + + GENERATOR_TYPE_UNSPECIFIED = 0 + FREE_FORM = 1 + AGENT_COACHING = 2 + SUMMARIZATION = 3 + TRANSLATION = 4 + AGENT_FEEDBACK = 5 + CUSTOMER_MESSAGE_GENERATION = 6 + + generator_type: "Conversation.GeneratorContext.GeneratorType" = proto.Field( + proto.ENUM, + number=1, + enum="Conversation.GeneratorContext.GeneratorType", + ) + name: str = proto.Field( proto.STRING, number=1, @@ -385,12 +436,25 @@ class ContentFormat(proto.Enum): number=10, message=TelephonyConnectionInfo, ) + initial_conversation_profile: gcd_conversation_profile.ConversationProfile = ( + proto.Field( + proto.MESSAGE, + number=15, + message=gcd_conversation_profile.ConversationProfile, + ) + ) ingested_context_references: MutableMapping[str, ContextReference] = proto.MapField( proto.STRING, proto.MESSAGE, number=17, message=ContextReference, ) + initial_generator_contexts: MutableMapping[str, GeneratorContext] = proto.MapField( + proto.STRING, + proto.MESSAGE, + number=18, + message=GeneratorContext, + ) class ConversationPhoneNumber(proto.Message): @@ -838,6 +902,9 @@ class Summary(proto.Message): sections. The key is the section's name and the value is the section's content. There is no specific format for the key or value. + sorted_text_sections (MutableSequence[google.cloud.dialogflow_v2beta1.types.SuggestConversationSummaryResponse.Summary.SummarySection]): + Same as text_sections, but in an order that is consistent + with the order of the sections in the generator. answer_record (str): The name of the answer record. Format: @@ -849,6 +916,25 @@ class Summary(proto.Message): was not used to generate this summary. """ + class SummarySection(proto.Message): + r"""A component of the generated summary. + + Attributes: + section (str): + Output only. Name of the section. + summary (str): + Output only. Summary text for the section. + """ + + section: str = proto.Field( + proto.STRING, + number=1, + ) + summary: str = proto.Field( + proto.STRING, + number=2, + ) + text: str = proto.Field( proto.STRING, number=1, @@ -858,6 +944,13 @@ class Summary(proto.Message): proto.STRING, number=4, ) + sorted_text_sections: MutableSequence[ + "SuggestConversationSummaryResponse.Summary.SummarySection" + ] = proto.RepeatedField( + proto.MESSAGE, + number=6, + message="SuggestConversationSummaryResponse.Summary.SummarySection", + ) answer_record: str = proto.Field( proto.STRING, number=3, @@ -1278,11 +1371,11 @@ class ConditionBoostSpec(proto.Message): The syntax and supported fields are the same as a filter expression. Examples: - - To boost documents with document ID "doc_1" or "doc_2", - and color "Red" or "Blue": + - To boost documents with document ID "doc_1" or "doc_2", + and color "Red" or "Blue": - - (id: ANY("doc_1", "doc_2")) AND (color: - ANY("Red","Blue")) + - (id: ANY("doc_1", "doc_2")) AND (color: + ANY("Red","Blue")) boost (float): Optional. Strength of the condition boost, which should be in [-1, 1]. Negative boost means demotion. Default is 0.0. @@ -1549,6 +1642,75 @@ class FilterSpecs(proto.Message): ) +class SearchKnowledgeDebugInfo(proto.Message): + r"""Debug information related to SearchKnowledge feature. + + Attributes: + datastore_response_reason (google.cloud.dialogflow_v2beta1.types.DatastoreResponseReason): + Response reason from datastore which + indicates data serving status or answer quality + degradation. + search_knowledge_behavior (google.cloud.dialogflow_v2beta1.types.SearchKnowledgeDebugInfo.SearchKnowledgeBehavior): + Configured behaviors for SearchKnowledge. + ingested_context_reference_debug_info (google.cloud.dialogflow_v2beta1.types.IngestedContextReferenceDebugInfo): + Information about parameters ingested for + search knowledge. + service_latency (google.cloud.dialogflow_v2beta1.types.ServiceLatency): + The latency of the service. + """ + + class SearchKnowledgeBehavior(proto.Message): + r"""Configured behaviors for SearchKnowledge. + + Attributes: + answer_generation_rewriter_on (bool): + Whether data store agent rewriter was turned + on for the request. + end_user_metadata_included (bool): + Whether end_user_metadata is included in the data store + agent call. + third_party_connector_allowed (bool): + This field indicates whether third party + connectors are enabled for the project. Note + that this field only indicates if the project is + allowlisted for connectors. + """ + + answer_generation_rewriter_on: bool = proto.Field( + proto.BOOL, + number=1, + ) + end_user_metadata_included: bool = proto.Field( + proto.BOOL, + number=2, + ) + third_party_connector_allowed: bool = proto.Field( + proto.BOOL, + number=4, + ) + + datastore_response_reason: participant.DatastoreResponseReason = proto.Field( + proto.ENUM, + number=1, + enum=participant.DatastoreResponseReason, + ) + search_knowledge_behavior: SearchKnowledgeBehavior = proto.Field( + proto.MESSAGE, + number=2, + message=SearchKnowledgeBehavior, + ) + ingested_context_reference_debug_info: participant.IngestedContextReferenceDebugInfo = proto.Field( + proto.MESSAGE, + number=3, + message=participant.IngestedContextReferenceDebugInfo, + ) + service_latency: participant.ServiceLatency = proto.Field( + proto.MESSAGE, + number=4, + message=participant.ServiceLatency, + ) + + class SearchKnowledgeResponse(proto.Message): r"""The response message for [Conversations.SearchKnowledge][google.cloud.dialogflow.v2beta1.Conversations.SearchKnowledge]. @@ -1560,6 +1722,8 @@ class SearchKnowledgeResponse(proto.Message): confidence. rewritten_query (str): The rewritten query used to search knowledge. + search_knowledge_debug_info (google.cloud.dialogflow_v2beta1.types.SearchKnowledgeDebugInfo): + Debug info for SearchKnowledge. """ answers: MutableSequence["SearchKnowledgeAnswer"] = proto.RepeatedField( @@ -1571,6 +1735,11 @@ class SearchKnowledgeResponse(proto.Message): proto.STRING, number=3, ) + search_knowledge_debug_info: "SearchKnowledgeDebugInfo" = proto.Field( + proto.MESSAGE, + number=4, + message="SearchKnowledgeDebugInfo", + ) class SearchKnowledgeAnswer(proto.Message): diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_event.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_event.py index 971c004bfff2..8d5490f8e059 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_event.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_event.py @@ -19,7 +19,6 @@ import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2beta1.types import participant, session __protobuf__ = proto.module( @@ -101,9 +100,9 @@ class Type(proto.Enum): We don't fire this event: - - in an API call because we can directly return the error, - or, - - when we can recover from an error. + - in an API call because we can directly return the error, + or, + - when we can recover from an error. """ TYPE_UNSPECIFIED = 0 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_profile.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_profile.py index 45e5ef265ef5..adb37e83b7b2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_profile.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_profile.py @@ -21,7 +21,6 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2beta1.types import audio_config, generator, participant __protobuf__ = proto.module( @@ -64,6 +63,10 @@ class ConversationProfile(proto.Message): update_time (google.protobuf.timestamp_pb2.Timestamp): Output only. Update time of the conversation profile. + use_bidi_streaming (bool): + Optional. Whether to use the bidi streaming + API in telephony integration for the + conversation profile. automated_agent_config (google.cloud.dialogflow_v2beta1.types.AutomatedAgentConfig): Configuration for an automated agent to use with this profile. @@ -94,9 +97,9 @@ class ConversationProfile(proto.Message): [ConversationEvent][google.cloud.dialogflow.v2beta1.ConversationEvent] Pub/Sub message attributes: - - "participant_id" - - "participant_role" - - "message_id". + - "participant_id" + - "participant_role" + - "message_id". stt_config (google.cloud.dialogflow_v2beta1.types.SpeechToTextConfig): Settings for speech transcription. language_code (str): @@ -142,6 +145,10 @@ class ConversationProfile(proto.Message): number=12, message=timestamp_pb2.Timestamp, ) + use_bidi_streaming: bool = proto.Field( + proto.BOOL, + number=23, + ) automated_agent_config: "AutomatedAgentConfig" = proto.Field( proto.MESSAGE, number=3, @@ -213,17 +220,17 @@ class AutomatedAgentConfig(proto.Message): ``service-@gcp-sa-dialogflow.iam.gserviceaccount.com`` the ``Dialogflow API Service Agent`` role in this project. - - For ES agents, use format: - ``projects//locations//agent/environments/``. - If environment is not specified, the default ``draft`` - environment is used. Refer to - `DetectIntentRequest `__ - for more details. - - - For CX agents, use format - ``projects//locations//agents//environments/``. - If environment is not specified, the default ``draft`` - environment is used. + - For ES agents, use format: + ``projects//locations//agent/environments/``. + If environment is not specified, the default ``draft`` + environment is used. Refer to + `DetectIntentRequest `__ + for more details. + + - For CX agents, use format + ``projects//locations//agents//environments/``. + If environment is not specified, the default ``draft`` + environment is used. session_ttl (google.protobuf.duration_pb2.Duration): Optional. Configure lifetime of the Dialogflow session. By default, a Dialogflow CX @@ -776,14 +783,14 @@ class ConversationModelConfig(proto.Message): [model][google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.ConversationModelConfig.model] is set. Valid versions are: - - Article Suggestion baseline model: + - Article Suggestion baseline model: - - 0.9 - - 1.0 (default) + - 0.9 + - 1.0 (default) - - Summarization baseline model: + - Summarization baseline model: - - 1.0 + - 1.0 """ model: str = proto.Field( @@ -845,6 +852,30 @@ class MessageAnalysisConfig(proto.Message): [ListMessagesResponse.messages.SentimentAnalysisResult][google.cloud.dialogflow.v2beta1.ListMessagesResponse.messages] If Pub/Sub notification is configured, result will be in [ConversationEvent.new_message_payload.SentimentAnalysisResult][google.cloud.dialogflow.v2beta1.ConversationEvent.new_message_payload]. + enable_sentiment_analysis_v3 (bool): + Optional. Enables sentiment analysis for audio input and + conversation messages. If unspecified, defaults to false. If + this flag is set to true, other 'enable_sentiment_analysis' + fields will be ignored. + + Sentiment analysis inspects user input and identifies the + prevailing subjective opinion, especially to determine a + user's attitude as positive, negative, or neutral. + https://cloud.google.com/natural-language/docs/basics#sentiment_analysis + For + [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2beta1.Participants.StreamingAnalyzeContent] + method, result will be in + [StreamingAnalyzeContentResponse.message.SentimentAnalysisResult][google.cloud.dialogflow.v2beta1.StreamingAnalyzeContentResponse.message]. + For + [Participants.AnalyzeContent][google.cloud.dialogflow.v2beta1.Participants.AnalyzeContent] + method, result will be in + [AnalyzeContentResponse.message.SentimentAnalysisResult][google.cloud.dialogflow.v2beta1.AnalyzeContentResponse.message] + For + [Conversations.ListMessages][google.cloud.dialogflow.v2beta1.Conversations.ListMessages] + method, result will be in + [ListMessagesResponse.messages.SentimentAnalysisResult][google.cloud.dialogflow.v2beta1.ListMessagesResponse.messages] + If Pub/Sub notification is configured, result will be in + [ConversationEvent.new_message_payload.SentimentAnalysisResult][google.cloud.dialogflow.v2beta1.ConversationEvent.new_message_payload]. """ enable_entity_extraction: bool = proto.Field( @@ -855,6 +886,10 @@ class MessageAnalysisConfig(proto.Message): proto.BOOL, number=3, ) + enable_sentiment_analysis_v3: bool = proto.Field( + proto.BOOL, + number=5, + ) notification_config: "NotificationConfig" = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/document.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/document.py index 6a28cb7e5f68..a8b37be768c7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/document.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/document.py @@ -21,7 +21,6 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2beta1.types import gcs __protobuf__ = proto.module( @@ -316,19 +315,19 @@ class ListDocumentsRequest(proto.Message): The following fields and operators are supported: - - knowledge_types with has(:) operator - - display_name with has(:) operator - - state with equals(=) operator + - knowledge_types with has(:) operator + - display_name with has(:) operator + - state with equals(=) operator Examples: - - "knowledge_types:FAQ" matches documents with FAQ knowledge - type. - - "display_name:customer" matches documents whose display - name contains "customer". - - "state=ACTIVE" matches documents with ACTIVE state. - - "knowledge_types:FAQ AND state=ACTIVE" matches all active - FAQ documents. + - "knowledge_types:FAQ" matches documents with FAQ + knowledge type. + - "display_name:customer" matches documents whose display + name contains "customer". + - "state=ACTIVE" matches documents with ACTIVE state. + - "knowledge_types:FAQ AND state=ACTIVE" matches all active + FAQ documents. For more information about filtering, see `API Filtering `__. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/entity_type.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/entity_type.py index 205055e7c50a..ba843057e144 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/entity_type.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/entity_type.py @@ -64,8 +64,8 @@ class EntityType(proto.Message): [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2beta1.EntityTypes.BatchUpdateEntityTypes] methods. Supported formats: - - ``projects//agent/entityTypes/`` - - ``projects//locations//agent/entityTypes/`` + - ``projects//agent/entityTypes/`` + - ``projects//locations//agent/entityTypes/`` display_name (str): Required. The name of the entity type. kind (google.cloud.dialogflow_v2beta1.types.EntityType.Kind): @@ -134,12 +134,12 @@ class Entity(proto.Message): For ``KIND_MAP`` entity types: - - A reference value to be used in place of synonyms. + - A reference value to be used in place of synonyms. For ``KIND_LIST`` entity types: - - A string that can contain references to other entity types - (with or without aliases). + - A string that can contain references to other entity + types (with or without aliases). synonyms (MutableSequence[str]): Required. A collection of value synonyms. For example, if the entity type is *vegetable*, and ``value`` is @@ -147,8 +147,8 @@ class Entity(proto.Message): For ``KIND_LIST`` entity types: - - This collection must contain exactly one synonym equal to - ``value``. + - This collection must contain exactly one synonym equal to + ``value``. """ value: str = proto.Field( @@ -198,8 +198,8 @@ class ListEntityTypesRequest(proto.Message): Required. The agent to list all entity types from. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` language_code (str): Optional. The language used to access language-specific data. If not specified, the agent's default language is @@ -271,8 +271,8 @@ class GetEntityTypeRequest(proto.Message): name (str): Required. The name of the entity type. Supported formats: - - ``projects//agent/entityTypes/`` - - ``projects//locations//agent/entityTypes/`` + - ``projects//agent/entityTypes/`` + - ``projects//locations//agent/entityTypes/`` language_code (str): Optional. The language used to access language-specific data. If not specified, the agent's default language is @@ -300,8 +300,8 @@ class CreateEntityTypeRequest(proto.Message): Required. The agent to create a entity type for. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` entity_type (google.cloud.dialogflow_v2beta1.types.EntityType): Required. The entity type to create. language_code (str): @@ -370,8 +370,8 @@ class DeleteEntityTypeRequest(proto.Message): Required. The name of the entity type to delete. Supported formats: - - ``projects//agent/entityTypes/`` - - ``projects//locations//agent/entityTypes/`` + - ``projects//agent/entityTypes/`` + - ``projects//locations//agent/entityTypes/`` """ name: str = proto.Field( @@ -396,8 +396,8 @@ class BatchUpdateEntityTypesRequest(proto.Message): Required. The name of the agent to update or create entity types in. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` entity_type_batch_uri (str): The URI to a Google Cloud Storage file containing entity types to update or create. The @@ -474,8 +474,8 @@ class BatchDeleteEntityTypesRequest(proto.Message): Required. The name of the agent to delete all entities types for. Supported formats: - - ``projects//agent``, - - ``projects//locations//agent``. + - ``projects//agent``, + - ``projects//locations//agent``. entity_type_names (MutableSequence[str]): Required. The names entity types to delete. All names must point to the same agent as ``parent``. @@ -500,8 +500,8 @@ class BatchCreateEntitiesRequest(proto.Message): Required. The name of the entity type to create entities in. Supported formats: - - ``projects//agent/entityTypes/`` - - ``projects//locations//agent/entityTypes/`` + - ``projects//agent/entityTypes/`` + - ``projects//locations//agent/entityTypes/`` entities (MutableSequence[google.cloud.dialogflow_v2beta1.types.EntityType.Entity]): Required. The entities to create. language_code (str): @@ -536,8 +536,8 @@ class BatchUpdateEntitiesRequest(proto.Message): Required. The name of the entity type to update or create entities in. Supported formats: - - ``projects//agent/entityTypes/`` - - ``projects//locations//agent/entityTypes/`` + - ``projects//agent/entityTypes/`` + - ``projects//locations//agent/entityTypes/`` entities (MutableSequence[google.cloud.dialogflow_v2beta1.types.EntityType.Entity]): Required. The entities to update or create. language_code (str): @@ -580,8 +580,8 @@ class BatchDeleteEntitiesRequest(proto.Message): Required. The name of the entity type to delete entries for. Supported formats: - - ``projects//agent/entityTypes/`` - - ``projects//locations//agent/entityTypes/`` + - ``projects//agent/entityTypes/`` + - ``projects//locations//agent/entityTypes/`` entity_values (MutableSequence[str]): Required. The reference ``values`` of the entities to delete. Note that these are not fully-qualified names, i.e. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/environment.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/environment.py index c545a9d12b48..16b6035aa3c2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/environment.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/environment.py @@ -20,7 +20,6 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2beta1.types import audio_config from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment @@ -54,10 +53,10 @@ class Environment(proto.Message): custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the `versions and environments guide `__. @@ -67,8 +66,8 @@ class Environment(proto.Message): Output only. The unique identifier of this agent environment. Supported formats: - - ``projects//agent/environments/`` - - ``projects//locations//agent/environments/`` + - ``projects//agent/environments/`` + - ``projects//locations//agent/environments/`` description (str): Optional. The developer-provided description for this environment. The maximum length is 500 @@ -78,8 +77,8 @@ class Environment(proto.Message): Optional. The agent version loaded into this environment. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` state (google.cloud.dialogflow_v2beta1.types.Environment.State): Output only. The state of this environment. This field is read-only, i.e., it cannot be set @@ -213,8 +212,8 @@ class ListEnvironmentsRequest(proto.Message): parent (str): Required. The agent to list all environments from. Format: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` page_size (int): Optional. The maximum number of items to return in a single page. By default 100 and at @@ -276,8 +275,8 @@ class GetEnvironmentRequest(proto.Message): name (str): Required. The name of the environment. Supported formats: - - ``projects//agent/environments/`` - - ``projects//locations//agent/environments/`` + - ``projects//agent/environments/`` + - ``projects//locations//agent/environments/`` """ name: str = proto.Field( @@ -295,8 +294,8 @@ class CreateEnvironmentRequest(proto.Message): Required. The agent to create an environment for. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` environment (google.cloud.dialogflow_v2beta1.types.Environment): Required. The environment to create. environment_id (str): @@ -361,8 +360,8 @@ class DeleteEnvironmentRequest(proto.Message): name (str): Required. The name of the environment to delete. / Format: - - ``projects//agent/environments/`` - - ``projects//locations//agent/environments/`` + - ``projects//agent/environments/`` + - ``projects//locations//agent/environments/`` """ name: str = proto.Field( @@ -380,8 +379,8 @@ class GetEnvironmentHistoryRequest(proto.Message): Required. The name of the environment to retrieve history for. Supported formats: - - ``projects//agent/environments/`` - - ``projects//locations//agent/environments/`` + - ``projects//agent/environments/`` + - ``projects//locations//agent/environments/`` page_size (int): Optional. The maximum number of items to return in a single page. By default 100 and at @@ -414,8 +413,8 @@ class EnvironmentHistory(proto.Message): Output only. The name of the environment this history is for. Supported formats: - - ``projects//agent/environments/`` - - ``projects//locations//agent/environments/`` + - ``projects//agent/environments/`` + - ``projects//locations//agent/environments/`` entries (MutableSequence[google.cloud.dialogflow_v2beta1.types.EnvironmentHistory.Entry]): Output only. The list of agent environments. There will be a maximum number of items returned based on the page_size diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/fulfillment.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/fulfillment.py index 972caf32aff7..1f0d7abd74d9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/fulfillment.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/fulfillment.py @@ -50,8 +50,8 @@ class Fulfillment(proto.Message): Required. The unique identifier of the fulfillment. Supported formats: - - ``projects//agent/fulfillment`` - - ``projects//locations//agent/fulfillment`` + - ``projects//agent/fulfillment`` + - ``projects//locations//agent/fulfillment`` This field is not used for Fulfillment in an Environment. display_name (str): @@ -183,8 +183,8 @@ class GetFulfillmentRequest(proto.Message): name (str): Required. The name of the fulfillment. Supported formats: - - ``projects//agent/fulfillment`` - - ``projects//locations//agent/fulfillment`` + - ``projects//agent/fulfillment`` + - ``projects//locations//agent/fulfillment`` """ name: str = proto.Field( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator.py index 19f64aa8dc7e..c2337290f9a1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator.py @@ -20,8 +20,12 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore - -from google.cloud.dialogflow_v2beta1.types import agent_coaching_instruction +from google.cloud.dialogflow_v2beta1.types import ( + agent_coaching_instruction, + ces_app, + ces_tool, + toolset, +) from google.cloud.dialogflow_v2beta1.types import tool_call as gcd_tool_call __protobuf__ = proto.module( @@ -657,10 +661,10 @@ class Generator(proto.Message): published_model (str): Optional. The published Large Language Model name. - - To use the latest model version, specify the model name - without version number. Example: ``text-bison`` - - To use a stable model version, specify the version number - as well. Example: ``text-bison@002``. + - To use the latest model version, specify the model name + without version number. Example: ``text-bison`` + - To use a stable model version, specify the version number + as well. Example: ``text-bison@002``. This field is a member of `oneof`_ ``foundation_model``. create_time (google.protobuf.timestamp_pb2.Timestamp): @@ -675,6 +679,15 @@ class Generator(proto.Message): Optional. Configuration for suggestion deduping. This is only applicable to AI Coach feature. + toolset_tools (MutableSequence[google.cloud.dialogflow_v2beta1.types.ToolsetTool]): + Optional. List of CES toolset specs that the + generator can choose from. + ces_tool_specs (MutableSequence[google.cloud.dialogflow_v2beta1.types.CesToolSpec]): + Optional. List of CES tool specs that the + generator can choose from. + ces_app_specs (MutableSequence[google.cloud.dialogflow_v2beta1.types.CesAppSpec]): + Optional. List of CES app specs that the + generator can choose from. """ name: str = proto.Field( @@ -737,6 +750,21 @@ class Generator(proto.Message): number=23, message="SuggestionDedupingConfig", ) + toolset_tools: MutableSequence[toolset.ToolsetTool] = proto.RepeatedField( + proto.MESSAGE, + number=27, + message=toolset.ToolsetTool, + ) + ces_tool_specs: MutableSequence[ces_tool.CesToolSpec] = proto.RepeatedField( + proto.MESSAGE, + number=28, + message=ces_tool.CesToolSpec, + ) + ces_app_specs: MutableSequence[ces_app.CesAppSpec] = proto.RepeatedField( + proto.MESSAGE, + number=29, + message=ces_app.CesAppSpec, + ) class FreeFormSuggestion(proto.Message): @@ -1095,10 +1123,10 @@ class SensitivityLevel(proto.Enum): SENSITIVITY_LEVEL_UNSPECIFIED (0): Default value. If unspecified, the default behavior is: - - DANGEROUS_CONTENT: BLOCK_FEW - - SEXUALLY_EXPLICIT: BLOCK_SOME - - HARASSMENT: BLOCK_SOME - - HATE_SPEECH: BLOCK_SOME + - DANGEROUS_CONTENT: BLOCK_FEW + - SEXUALLY_EXPLICIT: BLOCK_SOME + - HARASSMENT: BLOCK_SOME + - HATE_SPEECH: BLOCK_SOME BLOCK_MOST (1): Block most potentially sensitive responses. BLOCK_SOME (2): diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator_evaluation.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator_evaluation.py index 50bf84d09459..4aef8d020ce1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator_evaluation.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator_evaluation.py @@ -20,7 +20,6 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2beta1.types import generator __protobuf__ = proto.module( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/human_agent_assistant_event.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/human_agent_assistant_event.py index f5308721fe04..32381d6a7af9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/human_agent_assistant_event.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/human_agent_assistant_event.py @@ -18,7 +18,6 @@ from typing import MutableMapping, MutableSequence import proto # type: ignore - from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant __protobuf__ = proto.module( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/intent.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/intent.py index 89b5f629fadf..f3553877d293 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/intent.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/intent.py @@ -20,7 +20,6 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2beta1.types import context __protobuf__ = proto.module( @@ -80,8 +79,8 @@ class Intent(proto.Message): [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2beta1.Intents.BatchUpdateIntents] methods. Supported formats: - - ``projects//agent/intents/`` - - ``projects//locations//agent/intents/`` + - ``projects//agent/intents/`` + - ``projects//locations//agent/intents/`` display_name (str): Required. The name of this intent. webhook_state (google.cloud.dialogflow_v2beta1.types.Intent.WebhookState): @@ -91,11 +90,11 @@ class Intent(proto.Message): Optional. The priority of this intent. Higher numbers represent higher priorities. - - If the supplied value is unspecified or 0, the service - translates the value to 500,000, which corresponds to the - ``Normal`` priority in the console. - - If the supplied value is negative, the intent is ignored - in runtime detect intent requests. + - If the supplied value is unspecified or 0, the service + translates the value to 500,000, which corresponds to the + ``Normal`` priority in the console. + - If the supplied value is negative, the intent is ignored + in runtime detect intent requests. is_fallback (bool): Optional. Indicates whether this is a fallback intent. @@ -109,10 +108,10 @@ class Intent(proto.Message): are either not set or false, then the default value is determined as follows: - - Before April 15th, 2018 the default is: ml_enabled = false - / ml_disabled = true. - - After April 15th, 2018 the default is: ml_enabled = true / - ml_disabled = false. + - Before April 15th, 2018 the default is: ml_enabled = + false / ml_disabled = true. + - After April 15th, 2018 the default is: ml_enabled = true + / ml_disabled = false. ml_disabled (bool): Optional. Indicates whether Machine Learning is disabled for the intent. Note: If ``ml_disabled`` setting is set to true, @@ -134,8 +133,8 @@ class Intent(proto.Message): Optional. The list of context names required for this intent to be triggered. Formats: - - ``projects//agent/sessions/-/contexts/`` - - ``projects//locations//agent/sessions/-/contexts/`` + - ``projects//agent/sessions/-/contexts/`` + - ``projects//locations//agent/sessions/-/contexts/`` events (MutableSequence[str]): Optional. The collection of event names that trigger the intent. If the collection of input @@ -244,11 +243,11 @@ class TrainingPhrase(proto.Message): multiple parts, where the fields of each part are populated in one of two ways: - - ``Part.text`` is set to a part of the phrase that has no - parameters. - - ``Part.text`` is set to a part of the phrase that you want - to annotate, and the ``entity_type``, ``alias``, and - ``user_defined`` fields are all set. + - ``Part.text`` is set to a part of the phrase that has no + parameters. + - ``Part.text`` is set to a part of the phrase that you + want to annotate, and the ``entity_type``, ``alias``, and + ``user_defined`` fields are all set. times_added_count (int): Optional. Indicates how many times this example was added to the intent. Each time a @@ -352,12 +351,12 @@ class Parameter(proto.Message): value (str): Optional. The definition of the parameter value. It can be: - - a constant string, - - a parameter value defined as ``$parameter_name``, - - an original parameter value defined as - ``$parameter_name.original``, - - a parameter value from some context defined as - ``#context_name.parameter_name``. + - a constant string, + - a parameter value defined as ``$parameter_name``, + - an original parameter value defined as + ``$parameter_name.original``, + - a parameter value from some context defined as + ``#context_name.parameter_name``. default_value (str): Optional. The default value to use when the ``value`` yields an empty result. Default values can be extracted from @@ -1242,19 +1241,19 @@ class RbmMedia(proto.Message): Image Types - - image/jpeg - - image/jpg' - - image/gif - - image/png + - image/jpeg + - image/jpg' + - image/gif + - image/png Video Types - - video/h263 - - video/m4v - - video/mp4 - - video/mpeg - - video/mpeg4 - - video/webm + - video/h263 + - video/m4v + - video/mp4 + - video/mpeg + - video/mpeg4 + - video/webm Attributes: file_uri (str): @@ -2214,8 +2213,8 @@ class GetIntentRequest(proto.Message): name (str): Required. The name of the intent. Supported formats: - - ``projects//agent/intents/`` - - ``projects//locations//agent/intents/`` + - ``projects//agent/intents/`` + - ``projects//locations//agent/intents/`` language_code (str): Optional. The language used to access language-specific data. If not specified, the agent's default language is @@ -2251,8 +2250,8 @@ class CreateIntentRequest(proto.Message): Required. The agent to create a intent for. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` intent (google.cloud.dialogflow_v2beta1.types.Intent): Required. The intent to create. language_code (str): @@ -2340,8 +2339,8 @@ class DeleteIntentRequest(proto.Message): Supported formats: - - ``projects//agent/intents/`` - - ``projects//locations//agent/intents/`` + - ``projects//agent/intents/`` + - ``projects//locations//agent/intents/`` """ name: str = proto.Field( @@ -2366,8 +2365,8 @@ class BatchUpdateIntentsRequest(proto.Message): Required. The name of the agent to update or create intents in. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` intent_batch_uri (str): The URI to a Google Cloud Storage file containing intents to update or create. The file @@ -2451,8 +2450,8 @@ class BatchDeleteIntentsRequest(proto.Message): Required. The name of the agent to delete all entities types for. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` intents (MutableSequence[google.cloud.dialogflow_v2beta1.types.Intent]): Required. The collection of intents to delete. Only intent ``name`` must be filled in. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/knowledge_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/knowledge_base.py index 7e431ef055ce..a38205500754 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/knowledge_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/knowledge_base.py @@ -100,20 +100,20 @@ class ListKnowledgeBasesRequest(proto.Message): The following fields and operators are supported: - - display_name with has(:) operator - - language_code with equals(=) operator + - display_name with has(:) operator + - language_code with equals(=) operator Examples: - - 'language_code=en-us' matches knowledge bases with en-us - language code. - - 'display_name:articles' matches knowledge bases whose - display name contains "articles". - - 'display_name:"Best Articles"' matches knowledge bases - whose display name contains "Best Articles". - - 'language_code=en-gb AND display_name=articles' matches - all knowledge bases whose display name contains "articles" - and whose language code is "en-gb". + - 'language_code=en-us' matches knowledge bases with en-us + language code. + - 'display_name:articles' matches knowledge bases whose + display name contains "articles". + - 'display_name:"Best Articles"' matches knowledge bases + whose display name contains "Best Articles". + - 'language_code=en-gb AND display_name=articles' matches + all knowledge bases whose display name contains + "articles" and whose language code is "en-gb". Note: An empty filter string (i.e. "") is a no-op and will result in no filtering. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/participant.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/participant.py index 51baa4b7cb39..1bfd61bb1a6f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/participant.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/participant.py @@ -22,13 +22,13 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2beta1.types import audio_config as gcd_audio_config from google.cloud.dialogflow_v2beta1.types import generator, session __protobuf__ = proto.module( package="google.cloud.dialogflow.v2beta1", manifest={ + "DatastoreResponseReason", "Participant", "Message", "CreateParticipantRequest", @@ -73,6 +73,9 @@ "ResponseMessage", "SuggestKnowledgeAssistRequest", "SuggestKnowledgeAssistResponse", + "IngestedContextReferenceDebugInfo", + "ServiceLatency", + "KnowledgeAssistDebugInfo", "KnowledgeAssistAnswer", "BidiStreamingAnalyzeContentRequest", "BidiStreamingAnalyzeContentResponse", @@ -80,6 +83,49 @@ ) +class DatastoreResponseReason(proto.Enum): + r"""Response reason from datastore which indicates data serving + status or answer quality degradation. + + Values: + DATASTORE_RESPONSE_REASON_UNSPECIFIED (0): + Default value. + NONE (1): + No specific response reason from datastore. + SEARCH_OUT_OF_QUOTA (2): + Search is blocked due to out of quota. + SEARCH_EMPTY_RESULTS (3): + Search returns empty results. + ANSWER_GENERATION_GEN_AI_DISABLED (4): + Generative AI is disabled. + ANSWER_GENERATION_OUT_OF_QUOTA (5): + Answer generation is blocked due to out of + quota. + ANSWER_GENERATION_ERROR (6): + Answer generation encounters an error. + ANSWER_GENERATION_NOT_ENOUGH_INFO (7): + Answer generation does not have enough + information to generate answer. + ANSWER_GENERATION_RAI_FAILED (8): + Answer generation is blocked by RAI + (Responsible AI) failure. + ANSWER_GENERATION_NOT_GROUNDED (9): + Answer generation is not grounded on reliable + sources. + """ + + DATASTORE_RESPONSE_REASON_UNSPECIFIED = 0 + NONE = 1 + SEARCH_OUT_OF_QUOTA = 2 + SEARCH_EMPTY_RESULTS = 3 + ANSWER_GENERATION_GEN_AI_DISABLED = 4 + ANSWER_GENERATION_OUT_OF_QUOTA = 5 + ANSWER_GENERATION_ERROR = 6 + ANSWER_GENERATION_NOT_ENOUGH_INFO = 7 + ANSWER_GENERATION_RAI_FAILED = 8 + ANSWER_GENERATION_NOT_GROUNDED = 9 + + class Participant(proto.Message): r"""Represents a conversation participant (human agent, virtual agent, end-user). @@ -124,11 +170,11 @@ class Participant(proto.Message): Note: - - Please never pass raw user ids to Dialogflow. Always - obfuscate your user id first. - - Dialogflow only accepts a UTF-8 encoded string, e.g., a - hex digest of a hash function like SHA-512. - - The length of the user id must be <= 256 characters. + - Please never pass raw user ids to Dialogflow. Always + obfuscate your user id first. + - Dialogflow only accepts a UTF-8 encoded string, e.g., a + hex digest of a hash function like SHA-512. + - The length of the user id must be <= 256 characters. documents_metadata_filters (MutableMapping[str, str]): Optional. Key-value filters on the metadata of documents returned by article suggestion. If specified, article @@ -913,14 +959,14 @@ class AnalyzeContentRequest(proto.Message): For BatchCreateMessages API only: Given two messages under the same participant: - - If send time are different regardless of whether the - content of the messages are exactly the same, the - conversation will regard them as two distinct messages - sent by the participant. - - If send time is the same regardless of whether the content - of the messages are exactly the same, the conversation - will regard them as same message, and ignore the message - received later. + - If send time are different regardless of whether the + content of the messages are exactly the same, the + conversation will regard them as two distinct messages + sent by the participant. + - If send time is the same regardless of whether the + content of the messages are exactly the same, the + conversation will regard them as same message, and ignore + the message received later. If the value is not provided, a new request will always be regarded as a new message without any de-duplication. @@ -1028,10 +1074,10 @@ class AnalyzeContentResponse(proto.Message): Optional. The audio data bytes encoded as specified in the request. This field is set if: - - ``reply_audio_config`` was specified in the request, or - - The automated agent responded with audio to play to the - user. In such case, ``reply_audio.config`` contains - settings used to synthesize the speech. + - ``reply_audio_config`` was specified in the request, or + - The automated agent responded with audio to play to the + user. In such case, ``reply_audio.config`` contains + settings used to synthesize the speech. In some scenarios, multiple output audio fields may be present in the response structure. In these cases, only the @@ -1160,9 +1206,9 @@ class StreamingAnalyzeContentRequest(proto.Message): However, note that: - - Dialogflow will bill you for the audio so far. - - Dialogflow discards all Speech recognition results in favor of - the text input. + - Dialogflow will bill you for the audio so far. + - Dialogflow discards all Speech recognition results in favor of + the text input. 3. If [StreamingAnalyzeContentRequest.config][google.cloud.dialogflow.v2beta1.StreamingAnalyzeContentRequest.config] @@ -1273,14 +1319,14 @@ class StreamingAnalyzeContentRequest(proto.Message): Restrictions: - - Timeout: 3 mins. - - Audio Encoding: only supports - [AudioEncoding.AUDIO_ENCODING_LINEAR_16][google.cloud.dialogflow.v2beta1.AudioEncoding.AUDIO_ENCODING_LINEAR_16] - and - [AudioEncoding.AUDIO_ENCODING_MULAW][google.cloud.dialogflow.v2beta1.AudioEncoding.AUDIO_ENCODING_MULAW] - - Lifecycle: conversation should be in ``Assist Stage``, go - to [Conversation.CreateConversation][] for more - information. + - Timeout: 3 mins. + - Audio Encoding: only supports + [AudioEncoding.AUDIO_ENCODING_LINEAR_16][google.cloud.dialogflow.v2beta1.AudioEncoding.AUDIO_ENCODING_LINEAR_16] + and + [AudioEncoding.AUDIO_ENCODING_MULAW][google.cloud.dialogflow.v2beta1.AudioEncoding.AUDIO_ENCODING_MULAW] + - Lifecycle: conversation should be in ``Assist Stage``, go + to [Conversation.CreateConversation][] for more + information. InvalidArgument Error will be returned if the one of restriction checks failed. @@ -1425,12 +1471,12 @@ class StreamingAnalyzeContentResponse(proto.Message): Optional. The audio data bytes encoded as specified in the request. This field is set if: - - The ``reply_audio_config`` field is specified in the - request. - - The automated agent, which this output comes from, - responded with audio. In such case, the - ``reply_audio.config`` field contains settings used to - synthesize the speech. + - The ``reply_audio_config`` field is specified in the + request. + - The automated agent, which this output comes from, + responded with audio. In such case, the + ``reply_audio.config`` field contains settings used to + synthesize the speech. In some scenarios, multiple output audio fields may be present in the response structure. In these cases, only the @@ -2629,10 +2675,11 @@ class LiveAgentHandoff(proto.Message): You may set this, for example: - - In the entry fulfillment of a Dialogflow CX Page if entering the - page indicates something went extremely wrong in the conversation. - - In a webhook response when you determine that the customer issue - can only be handled by a human. + - In the entry fulfillment of a Dialogflow CX Page if entering the + page indicates something went extremely wrong in the + conversation. + - In a webhook response when you determine that the customer issue + can only be handled by a human. Attributes: metadata (google.protobuf.struct_pb2.Struct): @@ -2867,6 +2914,406 @@ class SuggestKnowledgeAssistResponse(proto.Message): ) +class IngestedContextReferenceDebugInfo(proto.Message): + r"""Debug information related to ingested context reference. + + Attributes: + project_not_allowlisted (bool): + Indicates if the project is allowlisted to + use ingested context reference. + context_reference_retrieved (bool): + The status of context_reference retrieval from database. + ingested_parameters_debug_info (MutableSequence[google.cloud.dialogflow_v2beta1.types.IngestedContextReferenceDebugInfo.IngestedParameterDebugInfo]): + Parameters ingested from the context + reference. + """ + + class IngestedParameterDebugInfo(proto.Message): + r"""Debug information related to ingested parameters from context + reference. + + Attributes: + parameter (str): + The name of the parameter in the context + reference. + ingestion_status (google.cloud.dialogflow_v2beta1.types.IngestedContextReferenceDebugInfo.IngestedParameterDebugInfo.IngestionStatus): + The ingestion status for this specific + parameter. + """ + + class IngestionStatus(proto.Enum): + r"""Enum representing the various states of parameter ingestion. + + Values: + INGESTION_STATUS_UNSPECIFIED (0): + Default value, indicates that the ingestion + status is not specified. + INGESTION_STATUS_SUCCEEDED (1): + Indicates that the parameter was successfully + ingested. + INGESTION_STATUS_CONTEXT_NOT_AVAILABLE (2): + Indicates that the parameter was not + available for ingestion. + INGESTION_STATUS_PARSE_FAILED (3): + Indicates that there was a failure parsing + the parameter content. + INGESTION_STATUS_INVALID_ENTRY (4): + Indicates that the context reference had an + unexpected number of content entries as Context + reference should only have one entry. + INGESTION_STATUS_INVALID_FORMAT (5): + Indicates that the context reference content + was not in the expected format (e.g., JSON). + INGESTION_STATUS_LANGUAGE_MISMATCH (6): + Indicates that the context reference language + does not match the conversation language. + """ + + INGESTION_STATUS_UNSPECIFIED = 0 + INGESTION_STATUS_SUCCEEDED = 1 + INGESTION_STATUS_CONTEXT_NOT_AVAILABLE = 2 + INGESTION_STATUS_PARSE_FAILED = 3 + INGESTION_STATUS_INVALID_ENTRY = 4 + INGESTION_STATUS_INVALID_FORMAT = 5 + INGESTION_STATUS_LANGUAGE_MISMATCH = 6 + + parameter: str = proto.Field( + proto.STRING, + number=1, + ) + ingestion_status: "IngestedContextReferenceDebugInfo.IngestedParameterDebugInfo.IngestionStatus" = proto.Field( + proto.ENUM, + number=2, + enum="IngestedContextReferenceDebugInfo.IngestedParameterDebugInfo.IngestionStatus", + ) + + project_not_allowlisted: bool = proto.Field( + proto.BOOL, + number=1, + ) + context_reference_retrieved: bool = proto.Field( + proto.BOOL, + number=2, + ) + ingested_parameters_debug_info: MutableSequence[IngestedParameterDebugInfo] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=IngestedParameterDebugInfo, + ) + ) + + +class ServiceLatency(proto.Message): + r"""Message to represent the latency of the service. + + Attributes: + internal_service_latencies (MutableSequence[google.cloud.dialogflow_v2beta1.types.ServiceLatency.InternalServiceLatency]): + A list of internal service latencies. + """ + + class InternalServiceLatency(proto.Message): + r"""Message to represent the latency of an internal service. + + Attributes: + step (str): + The name of the internal service. + latency_ms (float): + The latency of the internal service in + milliseconds. + start_time (google.protobuf.timestamp_pb2.Timestamp): + The start time of the internal service. + complete_time (google.protobuf.timestamp_pb2.Timestamp): + The completion time of the internal service. + """ + + step: str = proto.Field( + proto.STRING, + number=1, + ) + latency_ms: float = proto.Field( + proto.FLOAT, + number=2, + ) + start_time: timestamp_pb2.Timestamp = proto.Field( + proto.MESSAGE, + number=3, + message=timestamp_pb2.Timestamp, + ) + complete_time: timestamp_pb2.Timestamp = proto.Field( + proto.MESSAGE, + number=4, + message=timestamp_pb2.Timestamp, + ) + + internal_service_latencies: MutableSequence[InternalServiceLatency] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=InternalServiceLatency, + ) + ) + + +class KnowledgeAssistDebugInfo(proto.Message): + r"""Debug information related to Knowledge Assist feature. + + Attributes: + query_generation_failure_reason (google.cloud.dialogflow_v2beta1.types.KnowledgeAssistDebugInfo.QueryGenerationFailureReason): + Reason for query generation. + query_categorization_failure_reason (google.cloud.dialogflow_v2beta1.types.KnowledgeAssistDebugInfo.QueryCategorizationFailureReason): + Reason for query categorization. + datastore_response_reason (google.cloud.dialogflow_v2beta1.types.DatastoreResponseReason): + Response reason from datastore which + indicates data serving status or answer quality + degradation. + knowledge_assist_behavior (google.cloud.dialogflow_v2beta1.types.KnowledgeAssistDebugInfo.KnowledgeAssistBehavior): + Configured behaviors for Knowedge Assist. + ingested_context_reference_debug_info (google.cloud.dialogflow_v2beta1.types.IngestedContextReferenceDebugInfo): + Information about parameters ingested for + search knowledge. + service_latency (google.cloud.dialogflow_v2beta1.types.ServiceLatency): + The latency of the service. + """ + + class QueryGenerationFailureReason(proto.Enum): + r"""Reason for query generation failure. + + Values: + QUERY_GENERATION_FAILURE_REASON_UNSPECIFIED (0): + Default value. + QUERY_GENERATION_OUT_OF_QUOTA (1): + Query generation is blocked due to out of + quota. + QUERY_GENERATION_FAILED (2): + Call to Knowedge Assist query generation + model fails. + QUERY_GENERATION_NO_QUERY_GENERATED (3): + Query generation model decides that there is + no new topic change or there has been similar + queries generated in the previous turns. + QUERY_GENERATION_RAI_FAILED (4): + Knowedge Assist generated query is blocked by + RAI (Responsible AI). + NOT_IN_ALLOWLIST (5): + Query generation is blocked by Knowledge + Assist conversation profile level / agent id + level filtering. + QUERY_GENERATION_QUERY_REDACTED (6): + The generated query is blocked due to + redaction. + QUERY_GENERATION_LLM_RESPONSE_PARSE_FAILED (10): + Query generation failed due to LLM response + parse failure. + QUERY_GENERATION_EMPTY_CONVERSATION (11): + The conversation has no messages. + QUERY_GENERATION_EMPTY_LAST_MESSAGE (12): + The last message in the conversation is + empty. + QUERY_GENERATION_TRIGGERING_EVENT_CONDITION_NOT_MET (13): + The trigger event condition is not met. This occurs in the + following scenarios: + + 1. The trigger_event is CUSTOMER_MESSAGE or UNSPECIFIED, but + the last message is not from the customer. + 2. The trigger_event is AGENT_MESSAGE, but the last message + is not from the agent. + """ + + QUERY_GENERATION_FAILURE_REASON_UNSPECIFIED = 0 + QUERY_GENERATION_OUT_OF_QUOTA = 1 + QUERY_GENERATION_FAILED = 2 + QUERY_GENERATION_NO_QUERY_GENERATED = 3 + QUERY_GENERATION_RAI_FAILED = 4 + NOT_IN_ALLOWLIST = 5 + QUERY_GENERATION_QUERY_REDACTED = 6 + QUERY_GENERATION_LLM_RESPONSE_PARSE_FAILED = 10 + QUERY_GENERATION_EMPTY_CONVERSATION = 11 + QUERY_GENERATION_EMPTY_LAST_MESSAGE = 12 + QUERY_GENERATION_TRIGGERING_EVENT_CONDITION_NOT_MET = 13 + + class QueryCategorizationFailureReason(proto.Enum): + r"""Reason for query categorization failure. + + Values: + QUERY_CATEGORIZATION_FAILURE_REASON_UNSPECIFIED (0): + Default value. + QUERY_CATEGORIZATION_INVALID_CONFIG (1): + Vertex AI Search config supplied for query + categorization is invalid. + QUERY_CATEGORIZATION_RESULT_NOT_FOUND (2): + Vertex AI Search result does not contain a + query categorization result. + QUERY_CATEGORIZATION_FAILED (3): + Vertex AI Search call fails. + """ + + QUERY_CATEGORIZATION_FAILURE_REASON_UNSPECIFIED = 0 + QUERY_CATEGORIZATION_INVALID_CONFIG = 1 + QUERY_CATEGORIZATION_RESULT_NOT_FOUND = 2 + QUERY_CATEGORIZATION_FAILED = 3 + + class KnowledgeAssistBehavior(proto.Message): + r"""Configured behaviors for Knowedge Assist. + + Attributes: + answer_generation_rewriter_on (bool): + Whether data store agent rewriter was turned + off for the request. + end_user_metadata_included (bool): + Whether end_user_metadata is included in the data store + agent call. + return_query_only (bool): + Whether customers configured to return query + only in the conversation profile. + use_pubsub_delivery (bool): + Whether customers configured to use pubsub to + deliver. + disable_sync_delivery (bool): + Whether customers configured to disable the + synchronous delivery of Knowedge Assist + response. + previous_queries_included (bool): + Whether previously suggested queries are + included in the query generation process. + use_translated_message (bool): + Translated message is included in query + generation process. + use_custom_safety_filter_level (bool): + Safety filter is adjusted by user. + conversation_transcript_has_mixed_languages (bool): + Conversation transcript has mixed languages. + query_generation_agent_language_mismatch (bool): + Whether the agent language from the + translation generator mismatches the end-user + language. + query_generation_end_user_language_mismatch (bool): + Whether the end-user language from the + translation generator mismatches the end-user + language. + third_party_connector_allowed (bool): + This field indicates whether third party + connectors are enabled for the project. + multiple_queries_generated (bool): + Indicates that the query generation model + generated multiple queries. + query_contained_search_context (bool): + Indicates that the generated query contains + search context. + invalid_items_query_suggestion_skipped (bool): + Indicates that invalid items were skipped + when parsing the LLM response. + primary_query_redacted_and_replaced (bool): + True if the primary suggested query was + redacted and replaced by an additional query. + appended_search_context_count (int): + The number of search contexts appended to the + query. + """ + + answer_generation_rewriter_on: bool = proto.Field( + proto.BOOL, + number=1, + ) + end_user_metadata_included: bool = proto.Field( + proto.BOOL, + number=2, + ) + return_query_only: bool = proto.Field( + proto.BOOL, + number=4, + ) + use_pubsub_delivery: bool = proto.Field( + proto.BOOL, + number=5, + ) + disable_sync_delivery: bool = proto.Field( + proto.BOOL, + number=6, + ) + previous_queries_included: bool = proto.Field( + proto.BOOL, + number=7, + ) + use_translated_message: bool = proto.Field( + proto.BOOL, + number=8, + ) + use_custom_safety_filter_level: bool = proto.Field( + proto.BOOL, + number=9, + ) + conversation_transcript_has_mixed_languages: bool = proto.Field( + proto.BOOL, + number=10, + ) + query_generation_agent_language_mismatch: bool = proto.Field( + proto.BOOL, + number=11, + ) + query_generation_end_user_language_mismatch: bool = proto.Field( + proto.BOOL, + number=12, + ) + third_party_connector_allowed: bool = proto.Field( + proto.BOOL, + number=13, + ) + multiple_queries_generated: bool = proto.Field( + proto.BOOL, + number=14, + ) + query_contained_search_context: bool = proto.Field( + proto.BOOL, + number=15, + ) + invalid_items_query_suggestion_skipped: bool = proto.Field( + proto.BOOL, + number=16, + ) + primary_query_redacted_and_replaced: bool = proto.Field( + proto.BOOL, + number=17, + ) + appended_search_context_count: int = proto.Field( + proto.INT32, + number=18, + ) + + query_generation_failure_reason: QueryGenerationFailureReason = proto.Field( + proto.ENUM, + number=1, + enum=QueryGenerationFailureReason, + ) + query_categorization_failure_reason: QueryCategorizationFailureReason = proto.Field( + proto.ENUM, + number=2, + enum=QueryCategorizationFailureReason, + ) + datastore_response_reason: "DatastoreResponseReason" = proto.Field( + proto.ENUM, + number=3, + enum="DatastoreResponseReason", + ) + knowledge_assist_behavior: KnowledgeAssistBehavior = proto.Field( + proto.MESSAGE, + number=4, + message=KnowledgeAssistBehavior, + ) + ingested_context_reference_debug_info: "IngestedContextReferenceDebugInfo" = ( + proto.Field( + proto.MESSAGE, + number=5, + message="IngestedContextReferenceDebugInfo", + ) + ) + service_latency: "ServiceLatency" = proto.Field( + proto.MESSAGE, + number=6, + message="ServiceLatency", + ) + + class KnowledgeAssistAnswer(proto.Message): r"""Represents a Knowledge Assist answer. @@ -2882,6 +3329,9 @@ class KnowledgeAssistAnswer(proto.Message): answer_record (str): The name of the answer record. Format: ``projects//locations//answer Records/``. + knowledge_assist_debug_info (google.cloud.dialogflow_v2beta1.types.KnowledgeAssistDebugInfo): + Debug information related to Knowledge Assist + feature. """ class SuggestedQuery(proto.Message): @@ -3017,6 +3467,11 @@ class Snippet(proto.Message): proto.STRING, number=3, ) + knowledge_assist_debug_info: "KnowledgeAssistDebugInfo" = proto.Field( + proto.MESSAGE, + number=7, + message="KnowledgeAssistDebugInfo", + ) class BidiStreamingAnalyzeContentRequest(proto.Message): diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/phone_number.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/phone_number.py index debe4c0bfabd..d70fb38685e4 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/phone_number.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/phone_number.py @@ -18,6 +18,7 @@ from typing import MutableMapping, MutableSequence import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -39,6 +40,9 @@ class PhoneNumber(proto.Message): project through a [PhoneNumberOrder][google.cloud.dialogflow.v2beta1.PhoneNumberOrder]. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: name (str): Optional. The unique identifier of this phone number. @@ -66,6 +70,14 @@ class PhoneNumber(proto.Message): ``ACTIVE``. ``PhoneNumber`` objects set to ``DELETE_REQUESTED`` always decline incoming calls and can be removed completely within 30 days. + allowed_sip_trunks (google.cloud.dialogflow_v2beta1.types.PhoneNumber.AllowedSipTrunks): + Optional. Only allow calls from the specified + SIP trunks. + + This field is a member of `oneof`_ ``inbound_restriction``. + purge_time (google.protobuf.timestamp_pb2.Timestamp): + Output only. The time at which this resource + will be purged. """ class LifecycleState(proto.Enum): @@ -85,6 +97,31 @@ class LifecycleState(proto.Enum): ACTIVE = 1 DELETE_REQUESTED = 2 + class AllowedSipTrunks(proto.Message): + r"""List of SIP trunks that are allowed to make calls to this + phone number. + + Attributes: + sip_trunks (MutableSequence[str]): + List of SIP trunks that are allowed to make + calls to this phone number. If empty, any SIP + trunk is allowed. + carrier_ids (MutableSequence[str]): + Optional. List of GTP carrier IDs allowed to + make calls to this phone number. Used for + private interconnects where standard SIP trunks + aren't applicable. + """ + + sip_trunks: MutableSequence[str] = proto.RepeatedField( + proto.STRING, + number=1, + ) + carrier_ids: MutableSequence[str] = proto.RepeatedField( + proto.STRING, + number=2, + ) + name: str = proto.Field( proto.STRING, number=1, @@ -102,6 +139,17 @@ class LifecycleState(proto.Enum): number=4, enum=LifecycleState, ) + allowed_sip_trunks: AllowedSipTrunks = proto.Field( + proto.MESSAGE, + number=7, + oneof="inbound_restriction", + message=AllowedSipTrunks, + ) + purge_time: timestamp_pb2.Timestamp = proto.Field( + proto.MESSAGE, + number=8, + message=timestamp_pb2.Timestamp, + ) class DeletePhoneNumberRequest(proto.Message): diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session.py index 630e575ebecc..a3fd509b9413 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session.py @@ -23,7 +23,6 @@ import google.rpc.status_pb2 as status_pb2 # type: ignore import google.type.latlng_pb2 as latlng_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2beta1.types import agent, context, session_entity_type from google.cloud.dialogflow_v2beta1.types import audio_config as gcd_audio_config from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent @@ -58,10 +57,10 @@ class DetectIntentRequest(proto.Message): Required. The name of the session this query is sent to. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, we assume @@ -412,14 +411,14 @@ class QueryResult(proto.Message): query_text (str): The original conversational query text: - - If natural language text was provided as input, - ``query_text`` contains a copy of the input. - - If natural language speech audio was provided as input, - ``query_text`` contains the speech recognition result. If - speech recognizer produced multiple alternatives, a - particular one is picked. - - If automatic spell correction is enabled, ``query_text`` - will contain the corrected user input. + - If natural language text was provided as input, + ``query_text`` contains a copy of the input. + - If natural language speech audio was provided as input, + ``query_text`` contains the speech recognition result. If + speech recognizer produced multiple alternatives, a + particular one is picked. + - If automatic spell correction is enabled, ``query_text`` + will contain the corrected user input. language_code (str): The language that was triggered during intent detection. See `Language @@ -448,24 +447,24 @@ class QueryResult(proto.Message): JSON object composed of a collection of (MapKey, MapValue) pairs: - - MapKey type: string - - MapKey value: parameter name - - MapValue type: If parameter's entity type is a composite - entity then use map, otherwise, depending on the parameter - value type, it could be one of string, number, boolean, - null, list or map. - - MapValue value: If parameter's entity type is a composite - entity then use map from composite entity property names - to property values, otherwise, use parameter value. + - MapKey type: string + - MapKey value: parameter name + - MapValue type: If parameter's entity type is a composite + entity then use map, otherwise, depending on the + parameter value type, it could be one of string, number, + boolean, null, list or map. + - MapValue value: If parameter's entity type is a composite + entity then use map from composite entity property names + to property values, otherwise, use parameter value. all_required_params_present (bool): This field is set to: - - ``false`` if the matched intent has required parameters - and not all of the required parameter values have been - collected. - - ``true`` if all required parameter values have been - collected, or if the matched intent doesn't contain any - required parameters. + - ``false`` if the matched intent has required parameters + and not all of the required parameter values have been + collected. + - ``true`` if all required parameter values have been + collected, or if the matched intent doesn't contain any + required parameters. cancels_slot_filling (bool): Indicates whether the conversational query triggers a cancellation for slot filling. For more information, see the @@ -730,10 +729,10 @@ class StreamingDetectIntentRequest(proto.Message): However, note that: - - Dialogflow will bill you for the audio duration so far. - - Dialogflow discards all Speech recognition results in favor of - the input text. - - Dialogflow will use the language code from the first message. + - Dialogflow will bill you for the audio duration so far. + - Dialogflow discards all Speech recognition results in favor of + the input text. + - Dialogflow will use the language code from the first message. After you sent all input, you must half-close or abort the request stream. @@ -743,10 +742,10 @@ class StreamingDetectIntentRequest(proto.Message): Required. The name of the session the query is sent to. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, we assume @@ -1179,12 +1178,12 @@ class StreamingRecognitionResult(proto.Message): will not change its guess about this interim recognition result: - - If the value is unspecified or 0.0, Dialogflow didn't - compute the stability. In particular, Dialogflow will only - provide stability for ``TRANSCRIPT`` results with - ``is_final = false``. - - Otherwise, the value is in (0.0, 1.0] where 0.0 means - completely unstable and 1.0 means completely stable. + - If the value is unspecified or 0.0, Dialogflow didn't + compute the stability. In particular, Dialogflow will + only provide stability for ``TRANSCRIPT`` results with + ``is_final = false``. + - Otherwise, the value is in (0.0, 1.0] where 0.0 means + completely unstable and 1.0 means completely stable. speech_word_info (MutableSequence[google.cloud.dialogflow_v2beta1.types.SpeechWordInfo]): Word-specific information for the words recognized by Speech in @@ -1328,15 +1327,15 @@ class EventInput(proto.Message): JSON object composed of a collection of (MapKey, MapValue) pairs: - - MapKey type: string - - MapKey value: parameter name - - MapValue type: If parameter's entity type is a composite - entity then use map, otherwise, depending on the parameter - value type, it could be one of string, number, boolean, - null, list or map. - - MapValue value: If parameter's entity type is a composite - entity then use map from composite entity property names - to property values, otherwise, use parameter value. + - MapKey type: string + - MapKey value: parameter name + - MapValue type: If parameter's entity type is a composite + entity then use map, otherwise, depending on the + parameter value type, it could be one of string, number, + boolean, null, list or map. + - MapValue value: If parameter's entity type is a composite + entity then use map from composite entity property names + to property values, otherwise, use parameter value. language_code (str): Required. The language of this query. See `Language Support `__ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session_entity_type.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session_entity_type.py index b129f4ace312..b955e1d98b77 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session_entity_type.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session_entity_type.py @@ -19,7 +19,6 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2beta1.types import entity_type __protobuf__ = proto.module( @@ -52,10 +51,10 @@ class SessionEntityType(proto.Message): Required. The unique identifier of this session entity type. Supported formats: - - ``projects//agent/sessions//entityTypes/`` - - ``projects//locations//agent/sessions//entityTypes/`` - - ``projects//agent/environments//users//sessions//entityTypes/`` - - ``projects//locations//agent/environments/ /users//sessions//entityTypes/`` + - ``projects//agent/sessions//entityTypes/`` + - ``projects//locations//agent/sessions//entityTypes/`` + - ``projects//agent/environments//users//sessions//entityTypes/`` + - ``projects//locations//agent/environments/ /users//sessions//entityTypes/`` If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, we assume @@ -127,10 +126,10 @@ class ListSessionEntityTypesRequest(proto.Message): Required. The session to list all session entity types from. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, we assume @@ -198,10 +197,10 @@ class GetSessionEntityTypeRequest(proto.Message): Required. The name of the session entity type. Supported formats: - - ``projects//agent/sessions//entityTypes/`` - - ``projects//locations//agent/sessions//entityTypes/`` - - ``projects//agent/environments//users//sessions//entityTypes/`` - - ``projects//locations//agent/environments/ /users//sessions//entityTypes/`` + - ``projects//agent/sessions//entityTypes/`` + - ``projects//locations//agent/sessions//entityTypes/`` + - ``projects//agent/environments//users//sessions//entityTypes/`` + - ``projects//locations//agent/environments/ /users//sessions//entityTypes/`` If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, we assume @@ -224,10 +223,10 @@ class CreateSessionEntityTypeRequest(proto.Message): Required. The session to create a session entity type for. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, we assume @@ -281,10 +280,10 @@ class DeleteSessionEntityTypeRequest(proto.Message): Required. The name of the entity type to delete. Supported formats: - - ``projects//agent/sessions//entityTypes/`` - - ``projects//locations//agent/sessions//entityTypes/`` - - ``projects//agent/environments//users//sessions//entityTypes/`` - - ``projects//locations//agent/environments/ /users//sessions//entityTypes/`` + - ``projects//agent/sessions//entityTypes/`` + - ``projects//locations//agent/sessions//entityTypes/`` + - ``projects//agent/environments//users//sessions//entityTypes/`` + - ``projects//locations//agent/environments/ /users//sessions//entityTypes/`` If ``Location ID`` is not specified we assume default 'us' location. If ``Environment ID`` is not specified, we assume diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool_call.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool_call.py index c93222d4f7eb..d6f9beb49f13 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool_call.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool_call.py @@ -34,6 +34,10 @@ class ToolCall(proto.Message): r"""Represents a call of a specific tool's action with the specified inputs. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields @@ -43,6 +47,21 @@ class ToolCall(proto.Message): associated with this call. Format: ``projects//locations//tools/``. + This field is a member of `oneof`_ ``source``. + ces_tool (str): + Optional. CES tool name for this call. Format: + ``projects//locations//apps//tools/``. + + This field is a member of `oneof`_ ``source``. + ces_toolset (str): + Optional. CES toolset name for this call. Format: + ``projects//locations//apps//toolsets/ToolsetID>``. + + This field is a member of `oneof`_ ``source``. + ces_app (str): + Optional. CES app name for this call. Format: + ``projects//locations//apps/``. + This field is a member of `oneof`_ ``source``. tool_display_name (str): Optional. A human readable short name of the @@ -86,6 +105,21 @@ class State(proto.Enum): number=1, oneof="source", ) + ces_tool: str = proto.Field( + proto.STRING, + number=11, + oneof="source", + ) + ces_toolset: str = proto.Field( + proto.STRING, + number=12, + oneof="source", + ) + ces_app: str = proto.Field( + proto.STRING, + number=8, + oneof="source", + ) tool_display_name: str = proto.Field( proto.STRING, number=9, @@ -135,6 +169,21 @@ class ToolCallResult(proto.Message): associated with this call. Format: ``projects//locations//tools/``. + This field is a member of `oneof`_ ``source``. + ces_tool (str): + Optional. CES tool name for this call. Format: + ``projects//locations//apps//tools/``. + + This field is a member of `oneof`_ ``source``. + ces_toolset (str): + Optional. CES toolset name for this call. Format: + ``projects//locations//apps//toolsets/ToolsetID>``. + + This field is a member of `oneof`_ ``source``. + ces_app (str): + Optional. CES app name for this call. Format: + ``projects//locations//apps/``. + This field is a member of `oneof`_ ``source``. action (str): Optional. The name of the tool's action @@ -180,6 +229,21 @@ class Error(proto.Message): number=1, oneof="source", ) + ces_tool: str = proto.Field( + proto.STRING, + number=12, + oneof="source", + ) + ces_toolset: str = proto.Field( + proto.STRING, + number=13, + oneof="source", + ) + ces_app: str = proto.Field( + proto.STRING, + number=11, + oneof="source", + ) action: str = proto.Field( proto.STRING, number=2, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/toolset.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/toolset.py new file mode 100644 index 000000000000..4d90931e6664 --- /dev/null +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/toolset.py @@ -0,0 +1,63 @@ +# -*- coding: utf-8 -*- +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +from __future__ import annotations + +from typing import MutableMapping, MutableSequence + +import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import tool + +__protobuf__ = proto.module( + package="google.cloud.dialogflow.v2beta1", + manifest={ + "ToolsetTool", + }, +) + + +class ToolsetTool(proto.Message): + r"""A tool that is created from a toolset. + + Attributes: + toolset (str): + Required. The name of the toolset to retrieve the schema + for. Format: + ``projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}`` + operation_id (str): + Optional. The operationId field of the + OpenAPI endpoint. The operationId must be + present in the toolset's definition. + confirmation_requirement (google.cloud.dialogflow_v2beta1.types.Tool.ConfirmationRequirement): + Optional. Indicates whether the tool requires + human confirmation. + """ + + toolset: str = proto.Field( + proto.STRING, + number=1, + ) + operation_id: str = proto.Field( + proto.STRING, + number=2, + ) + confirmation_requirement: tool.Tool.ConfirmationRequirement = proto.Field( + proto.ENUM, + number=3, + enum=tool.Tool.ConfirmationRequirement, + ) + + +__all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/validation_result.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/validation_result.py index 3e945f490d9f..e7ff864aac2e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/validation_result.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/validation_result.py @@ -38,17 +38,18 @@ class ValidationError(proto.Message): The names of the entries that the error is associated with. Format: - - ``projects//agent``, if the error is - associated with the entire agent. - - ``projects//agent/intents/``, if - the error is associated with certain intents. - - ``projects//agent/intents//trainingPhrases/``, - if the error is associated with certain intent training - phrases. - - ``projects//agent/intents//parameters/``, - if the error is associated with certain intent parameters. - - ``projects//agent/entities/``, if - the error is associated with certain entities. + - ``projects//agent``, if the error is + associated with the entire agent. + - ``projects//agent/intents/``, if + the error is associated with certain intents. + - ``projects//agent/intents//trainingPhrases/``, + if the error is associated with certain intent training + phrases. + - ``projects//agent/intents//parameters/``, + if the error is associated with certain intent + parameters. + - ``projects//agent/entities/``, if + the error is associated with certain entities. error_message (str): The detailed error message. """ diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/version.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/version.py index be96494bca60..60a41c081fc0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/version.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/version.py @@ -48,10 +48,10 @@ class Version(proto.Message): custom environments. You can create a variety of custom environments for: - - testing - - development - - production - - etc. + - testing + - development + - production + - etc. For more information, see the `versions and environments guide `__. @@ -61,8 +61,8 @@ class Version(proto.Message): Output only. The unique identifier of this agent version. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` description (str): Optional. The developer-provided description of this version. @@ -133,8 +133,8 @@ class ListVersionsRequest(proto.Message): Required. The agent to list all versions from. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` page_size (int): Optional. The maximum number of items to return in a single page. By default 100 and at @@ -196,8 +196,8 @@ class GetVersionRequest(proto.Message): name (str): Required. The name of the version. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` """ name: str = proto.Field( @@ -215,8 +215,8 @@ class CreateVersionRequest(proto.Message): Required. The agent to create a version for. Supported formats: - - ``projects//agent`` - - ``projects//locations//agent`` + - ``projects//agent`` + - ``projects//locations//agent`` version (google.cloud.dialogflow_v2beta1.types.Version): Required. The version to create. """ @@ -240,8 +240,8 @@ class UpdateVersionRequest(proto.Message): version (google.cloud.dialogflow_v2beta1.types.Version): Required. The version to update. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` update_mask (google.protobuf.field_mask_pb2.FieldMask): Required. The mask to control which fields get updated. @@ -268,8 +268,8 @@ class DeleteVersionRequest(proto.Message): Required. The name of the version to delete. Supported formats: - - ``projects//agent/versions/`` - - ``projects//locations//agent/versions/`` + - ``projects//agent/versions/`` + - ``projects//locations//agent/versions/`` """ name: str = proto.Field( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/webhook.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/webhook.py index 8b10168d6c92..4fdbc4dc4949 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/webhook.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/webhook.py @@ -19,7 +19,6 @@ import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore - from google.cloud.dialogflow_v2beta1.types import context, intent, session_entity_type from google.cloud.dialogflow_v2beta1.types import session as gcd_session @@ -42,10 +41,10 @@ class WebhookRequest(proto.Message): be used to identify end-user inside webhook implementation. Supported formats: - - \`projects//agent/sessions/, - - ``projects//locations//agent/sessions/``, - - ``projects//agent/environments//users//sessions/``, - - ``projects//locations//agent/environments//users//sessions/``, + - \`projects//agent/sessions/, + - ``projects//locations//agent/sessions/``, + - ``projects//agent/environments//users//sessions/``, + - ``projects//locations//agent/environments//users//sessions/``, response_id (str): The unique identifier of the response. Contains the same value as ``[Streaming]DetectIntentResponse.response_id``. @@ -97,9 +96,9 @@ class WebhookResponse(proto.Message): field. Setting JSON fields to an empty value with the wrong type is a common error. To avoid this error: - - Use ``""`` for empty strings - - Use ``{}`` or ``null`` for empty objects - - Use ``[]`` or ``null`` for empty arrays + - Use ``""`` for empty strings + - Use ``{}`` or ``null`` for empty objects + - Use ``[]`` or ``null`` for empty arrays For more information, see the `Protocol Buffers Language Guide `__. diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_agents_export_agent_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_agents_export_agent_async.py index e88262d0ad26..b83743ff7b2f 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_agents_export_agent_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_agents_export_agent_async.py @@ -45,11 +45,11 @@ async def sample_export_agent(): ) # Make the request - operation = client.export_agent(request=request) + operation = await client.export_agent(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_agents_import_agent_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_agents_import_agent_async.py index 836d87c9d9a7..3de4305d01da 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_agents_import_agent_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_agents_import_agent_async.py @@ -45,11 +45,11 @@ async def sample_import_agent(): ) # Make the request - operation = client.import_agent(request=request) + operation = await client.import_agent(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_agents_restore_agent_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_agents_restore_agent_async.py index b7e044163c82..db7b010a2e7a 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_agents_restore_agent_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_agents_restore_agent_async.py @@ -45,11 +45,11 @@ async def sample_restore_agent(): ) # Make the request - operation = client.restore_agent(request=request) + operation = await client.restore_agent(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_agents_train_agent_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_agents_train_agent_async.py index 03a0fae3673d..70a2032a7b77 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_agents_train_agent_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_agents_train_agent_async.py @@ -44,11 +44,11 @@ async def sample_train_agent(): ) # Make the request - operation = client.train_agent(request=request) + operation = await client.train_agent(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_datasets_create_conversation_dataset_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_datasets_create_conversation_dataset_async.py index 5fc905f60d57..eb6e144f6ae6 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_datasets_create_conversation_dataset_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_datasets_create_conversation_dataset_async.py @@ -48,11 +48,11 @@ async def sample_create_conversation_dataset(): ) # Make the request - operation = client.create_conversation_dataset(request=request) + operation = await client.create_conversation_dataset(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_datasets_delete_conversation_dataset_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_datasets_delete_conversation_dataset_async.py index fbee2588b18d..3b61850f31a8 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_datasets_delete_conversation_dataset_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_datasets_delete_conversation_dataset_async.py @@ -44,11 +44,11 @@ async def sample_delete_conversation_dataset(): ) # Make the request - operation = client.delete_conversation_dataset(request=request) + operation = await client.delete_conversation_dataset(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_datasets_import_conversation_data_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_datasets_import_conversation_data_async.py index b93f6bb90960..5d3da552d033 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_datasets_import_conversation_data_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_datasets_import_conversation_data_async.py @@ -48,11 +48,11 @@ async def sample_import_conversation_data(): ) # Make the request - operation = client.import_conversation_data(request=request) + operation = await client.import_conversation_data(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_create_conversation_model_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_create_conversation_model_async.py index d79dfa0a3b31..763ee7536d5d 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_create_conversation_model_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_create_conversation_model_async.py @@ -48,11 +48,11 @@ async def sample_create_conversation_model(): ) # Make the request - operation = client.create_conversation_model(request=request) + operation = await client.create_conversation_model(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_create_conversation_model_evaluation_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_create_conversation_model_evaluation_async.py index 7b236620356d..3d14c56c726c 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_create_conversation_model_evaluation_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_create_conversation_model_evaluation_async.py @@ -44,11 +44,11 @@ async def sample_create_conversation_model_evaluation(): ) # Make the request - operation = client.create_conversation_model_evaluation(request=request) + operation = await client.create_conversation_model_evaluation(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_delete_conversation_model_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_delete_conversation_model_async.py index 220c249112ae..cc774734ecf0 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_delete_conversation_model_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_delete_conversation_model_async.py @@ -44,11 +44,11 @@ async def sample_delete_conversation_model(): ) # Make the request - operation = client.delete_conversation_model(request=request) + operation = await client.delete_conversation_model(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_deploy_conversation_model_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_deploy_conversation_model_async.py index 19131c6ae326..b1612b3d0679 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_deploy_conversation_model_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_deploy_conversation_model_async.py @@ -44,11 +44,11 @@ async def sample_deploy_conversation_model(): ) # Make the request - operation = client.deploy_conversation_model(request=request) + operation = await client.deploy_conversation_model(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_undeploy_conversation_model_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_undeploy_conversation_model_async.py index 38dbc67e8750..d782608f322a 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_undeploy_conversation_model_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_models_undeploy_conversation_model_async.py @@ -44,11 +44,11 @@ async def sample_undeploy_conversation_model(): ) # Make the request - operation = client.undeploy_conversation_model(request=request) + operation = await client.undeploy_conversation_model(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_profiles_clear_suggestion_feature_config_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_profiles_clear_suggestion_feature_config_async.py index de61ff4429e2..ca71ca5ea0f7 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_profiles_clear_suggestion_feature_config_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_profiles_clear_suggestion_feature_config_async.py @@ -46,11 +46,11 @@ async def sample_clear_suggestion_feature_config(): ) # Make the request - operation = client.clear_suggestion_feature_config(request=request) + operation = await client.clear_suggestion_feature_config(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_profiles_set_suggestion_feature_config_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_profiles_set_suggestion_feature_config_async.py index db73189da610..feb4b0be2a4b 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_profiles_set_suggestion_feature_config_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_conversation_profiles_set_suggestion_feature_config_async.py @@ -45,11 +45,11 @@ async def sample_set_suggestion_feature_config(): ) # Make the request - operation = client.set_suggestion_feature_config(request=request) + operation = await client.set_suggestion_feature_config(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_create_document_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_create_document_async.py index 53d0caf16076..481bc6509713 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_create_document_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_create_document_async.py @@ -51,11 +51,11 @@ async def sample_create_document(): ) # Make the request - operation = client.create_document(request=request) + operation = await client.create_document(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_delete_document_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_delete_document_async.py index 9046ed0cd1ca..fa9edfbe29a6 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_delete_document_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_delete_document_async.py @@ -44,11 +44,11 @@ async def sample_delete_document(): ) # Make the request - operation = client.delete_document(request=request) + operation = await client.delete_document(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_export_document_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_export_document_async.py index 552a650db777..460cf56246ef 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_export_document_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_export_document_async.py @@ -44,11 +44,11 @@ async def sample_export_document(): ) # Make the request - operation = client.export_document(request=request) + operation = await client.export_document(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_import_documents_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_import_documents_async.py index dc7044ca1efc..da48df627aac 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_import_documents_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_import_documents_async.py @@ -53,11 +53,11 @@ async def sample_import_documents(): ) # Make the request - operation = client.import_documents(request=request) + operation = await client.import_documents(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_reload_document_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_reload_document_async.py index 6efa406dd67e..f1674ea36837 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_reload_document_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_reload_document_async.py @@ -45,11 +45,11 @@ async def sample_reload_document(): ) # Make the request - operation = client.reload_document(request=request) + operation = await client.reload_document(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_update_document_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_update_document_async.py index a93ed3b51def..30083371be00 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_update_document_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_documents_update_document_async.py @@ -50,11 +50,11 @@ async def sample_update_document(): ) # Make the request - operation = client.update_document(request=request) + operation = await client.update_document(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_encryption_spec_service_initialize_encryption_spec_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_encryption_spec_service_initialize_encryption_spec_async.py index 637519030bda..6e7c9ab66736 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_encryption_spec_service_initialize_encryption_spec_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_encryption_spec_service_initialize_encryption_spec_async.py @@ -47,11 +47,11 @@ async def sample_initialize_encryption_spec(): ) # Make the request - operation = client.initialize_encryption_spec(request=request) + operation = await client.initialize_encryption_spec(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_create_entities_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_create_entities_async.py index accea3ec843a..f96b54be506b 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_create_entities_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_create_entities_async.py @@ -49,11 +49,11 @@ async def sample_batch_create_entities(): ) # Make the request - operation = client.batch_create_entities(request=request) + operation = await client.batch_create_entities(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_delete_entities_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_delete_entities_async.py index dbd5c7c4775f..e10deffad209 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_delete_entities_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_delete_entities_async.py @@ -45,11 +45,11 @@ async def sample_batch_delete_entities(): ) # Make the request - operation = client.batch_delete_entities(request=request) + operation = await client.batch_delete_entities(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_delete_entity_types_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_delete_entity_types_async.py index d0062f585797..88c56044b02a 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_delete_entity_types_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_delete_entity_types_async.py @@ -45,11 +45,11 @@ async def sample_batch_delete_entity_types(): ) # Make the request - operation = client.batch_delete_entity_types(request=request) + operation = await client.batch_delete_entity_types(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_update_entities_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_update_entities_async.py index 0658fb71f8da..64cae7cb4dbc 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_update_entities_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_update_entities_async.py @@ -49,11 +49,11 @@ async def sample_batch_update_entities(): ) # Make the request - operation = client.batch_update_entities(request=request) + operation = await client.batch_update_entities(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_update_entity_types_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_update_entity_types_async.py index 7ae812083232..bdbe9c3044e1 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_update_entity_types_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_entity_types_batch_update_entity_types_async.py @@ -45,11 +45,11 @@ async def sample_batch_update_entity_types(): ) # Make the request - operation = client.batch_update_entity_types(request=request) + operation = await client.batch_update_entity_types(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_async.py index e9a94415f3f4..df9ed3772b06 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_async.py @@ -52,11 +52,11 @@ async def sample_create_generator_evaluation(): ) # Make the request - operation = client.create_generator_evaluation(request=request) + operation = await client.create_generator_evaluation(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_intents_batch_delete_intents_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_intents_batch_delete_intents_async.py index 70dcfc143631..e0786af36d01 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_intents_batch_delete_intents_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_intents_batch_delete_intents_async.py @@ -48,11 +48,11 @@ async def sample_batch_delete_intents(): ) # Make the request - operation = client.batch_delete_intents(request=request) + operation = await client.batch_delete_intents(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_intents_batch_update_intents_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_intents_batch_update_intents_async.py index 04d3a9b71764..e41f0271e9fc 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_intents_batch_update_intents_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_intents_batch_update_intents_async.py @@ -45,11 +45,11 @@ async def sample_batch_update_intents(): ) # Make the request - operation = client.batch_update_intents(request=request) + operation = await client.batch_update_intents(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_agents_export_agent_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_agents_export_agent_async.py index b9d4cbc0f717..8639fa3c299d 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_agents_export_agent_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_agents_export_agent_async.py @@ -44,11 +44,11 @@ async def sample_export_agent(): ) # Make the request - operation = client.export_agent(request=request) + operation = await client.export_agent(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_agents_import_agent_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_agents_import_agent_async.py index 66d985e70e03..dd12a8892a48 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_agents_import_agent_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_agents_import_agent_async.py @@ -45,11 +45,11 @@ async def sample_import_agent(): ) # Make the request - operation = client.import_agent(request=request) + operation = await client.import_agent(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_agents_restore_agent_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_agents_restore_agent_async.py index b420abf38cda..bf8b2e21bbdf 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_agents_restore_agent_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_agents_restore_agent_async.py @@ -45,11 +45,11 @@ async def sample_restore_agent(): ) # Make the request - operation = client.restore_agent(request=request) + operation = await client.restore_agent(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_agents_train_agent_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_agents_train_agent_async.py index 59ce34a09456..82d3eed1de6c 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_agents_train_agent_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_agents_train_agent_async.py @@ -44,11 +44,11 @@ async def sample_train_agent(): ) # Make the request - operation = client.train_agent(request=request) + operation = await client.train_agent(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_conversation_profiles_clear_suggestion_feature_config_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_conversation_profiles_clear_suggestion_feature_config_async.py index cb11e13ed977..eb1e7ad3e1a2 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_conversation_profiles_clear_suggestion_feature_config_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_conversation_profiles_clear_suggestion_feature_config_async.py @@ -46,11 +46,11 @@ async def sample_clear_suggestion_feature_config(): ) # Make the request - operation = client.clear_suggestion_feature_config(request=request) + operation = await client.clear_suggestion_feature_config(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_conversation_profiles_set_suggestion_feature_config_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_conversation_profiles_set_suggestion_feature_config_async.py index b1a562f25ebf..66031702877f 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_conversation_profiles_set_suggestion_feature_config_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_conversation_profiles_set_suggestion_feature_config_async.py @@ -45,11 +45,11 @@ async def sample_set_suggestion_feature_config(): ) # Make the request - operation = client.set_suggestion_feature_config(request=request) + operation = await client.set_suggestion_feature_config(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_create_document_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_create_document_async.py index 1faa67646968..5c6b927b9ab5 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_create_document_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_create_document_async.py @@ -51,11 +51,11 @@ async def sample_create_document(): ) # Make the request - operation = client.create_document(request=request) + operation = await client.create_document(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_delete_document_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_delete_document_async.py index 4aeca447714b..ff52e51918cf 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_delete_document_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_delete_document_async.py @@ -44,11 +44,11 @@ async def sample_delete_document(): ) # Make the request - operation = client.delete_document(request=request) + operation = await client.delete_document(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_import_documents_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_import_documents_async.py index 19a1f1b92280..f19c77f55206 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_import_documents_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_import_documents_async.py @@ -53,11 +53,11 @@ async def sample_import_documents(): ) # Make the request - operation = client.import_documents(request=request) + operation = await client.import_documents(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_reload_document_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_reload_document_async.py index d534443ad973..0a457e2bd3ac 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_reload_document_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_reload_document_async.py @@ -44,11 +44,11 @@ async def sample_reload_document(): ) # Make the request - operation = client.reload_document(request=request) + operation = await client.reload_document(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_update_document_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_update_document_async.py index fad92aca4a68..52210edfcb63 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_update_document_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_documents_update_document_async.py @@ -50,11 +50,11 @@ async def sample_update_document(): ) # Make the request - operation = client.update_document(request=request) + operation = await client.update_document(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_encryption_spec_service_initialize_encryption_spec_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_encryption_spec_service_initialize_encryption_spec_async.py index 3b4bdef01919..ea8d756fb387 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_encryption_spec_service_initialize_encryption_spec_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_encryption_spec_service_initialize_encryption_spec_async.py @@ -47,11 +47,11 @@ async def sample_initialize_encryption_spec(): ) # Make the request - operation = client.initialize_encryption_spec(request=request) + operation = await client.initialize_encryption_spec(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_create_entities_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_create_entities_async.py index 43345544856f..f9d4c65d2c13 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_create_entities_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_create_entities_async.py @@ -48,11 +48,11 @@ async def sample_batch_create_entities(): ) # Make the request - operation = client.batch_create_entities(request=request) + operation = await client.batch_create_entities(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_delete_entities_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_delete_entities_async.py index 27af48ddeaac..5f134e0513d9 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_delete_entities_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_delete_entities_async.py @@ -45,11 +45,11 @@ async def sample_batch_delete_entities(): ) # Make the request - operation = client.batch_delete_entities(request=request) + operation = await client.batch_delete_entities(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_delete_entity_types_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_delete_entity_types_async.py index 7fe343e49e19..bb717cf6615e 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_delete_entity_types_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_delete_entity_types_async.py @@ -45,11 +45,11 @@ async def sample_batch_delete_entity_types(): ) # Make the request - operation = client.batch_delete_entity_types(request=request) + operation = await client.batch_delete_entity_types(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_update_entities_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_update_entities_async.py index 2ed489c7bd99..7bfad338a187 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_update_entities_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_update_entities_async.py @@ -48,11 +48,11 @@ async def sample_batch_update_entities(): ) # Make the request - operation = client.batch_update_entities(request=request) + operation = await client.batch_update_entities(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_update_entity_types_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_update_entity_types_async.py index 51064f029fb4..cfd9df0ef80c 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_update_entity_types_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_entity_types_batch_update_entity_types_async.py @@ -45,11 +45,11 @@ async def sample_batch_update_entity_types(): ) # Make the request - operation = client.batch_update_entity_types(request=request) + operation = await client.batch_update_entity_types(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_async.py index c33f71f29d48..a36d553d7996 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_async.py @@ -52,11 +52,11 @@ async def sample_create_generator_evaluation(): ) # Make the request - operation = client.create_generator_evaluation(request=request) + operation = await client.create_generator_evaluation(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_intents_batch_delete_intents_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_intents_batch_delete_intents_async.py index 698585790476..8a9a13c04194 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_intents_batch_delete_intents_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_intents_batch_delete_intents_async.py @@ -48,11 +48,11 @@ async def sample_batch_delete_intents(): ) # Make the request - operation = client.batch_delete_intents(request=request) + operation = await client.batch_delete_intents(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_intents_batch_update_intents_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_intents_batch_update_intents_async.py index 27962a3076ca..8c4fb831cbb7 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_intents_batch_update_intents_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_intents_batch_update_intents_async.py @@ -45,11 +45,11 @@ async def sample_batch_update_intents(): ) # Make the request - operation = client.batch_update_intents(request=request) + operation = await client.batch_update_intents(request=request) print("Waiting for operation to complete...") - response = (await operation).result() + response = await operation.result() # Handle the response print(response) diff --git a/packages/google-cloud-dialogflow/setup.py b/packages/google-cloud-dialogflow/setup.py index 2324a79805db..f702c1675b4c 100644 --- a/packages/google-cloud-dialogflow/setup.py +++ b/packages/google-cloud-dialogflow/setup.py @@ -39,11 +39,11 @@ release_status = "Development Status :: 5 - Production/Stable" dependencies = [ - "google-api-core[grpc] >= 2.11.0, <3.0.0", + "google-api-core[grpc] >= 2.17.1, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", - "grpcio >= 1.33.2, < 2.0.0", + "grpcio >= 1.44.0, < 2.0.0", "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", "proto-plus >= 1.22.3, <2.0.0", "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", @@ -71,7 +71,7 @@ long_description=readme, author="Google LLC", author_email="googleapis-packages@google.com", - license="Apache 2.0", + license="Apache-2.0", url=url, classifiers=[ release_status, diff --git a/packages/google-cloud-dialogflow/testing/constraints-3.9.txt b/packages/google-cloud-dialogflow/testing/constraints-3.9.txt index ac3833d41b9a..4fabf1676a51 100644 --- a/packages/google-cloud-dialogflow/testing/constraints-3.9.txt +++ b/packages/google-cloud-dialogflow/testing/constraints-3.9.txt @@ -5,9 +5,8 @@ # pinning their versions to their lower bounds. # For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0", # then this file should have google-cloud-foo==1.14.0 -google-api-core==2.21.0 -google-auth==2.35.0 -# TODO(https://github.com/googleapis/gapic-generator-python/issues/2453) -# Add the minimum supported version of grpcio to constraints files +google-api-core==2.17.1 +google-auth==2.14.1 +grpcio==1.44.0 proto-plus==1.22.3 protobuf==4.25.8 diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_agents.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_agents.py index 226d67de276e..de3197310bd3 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_agents.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_agents.py @@ -62,10 +62,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.agents import ( AgentsAsyncClient, AgentsClient, @@ -74,6 +70,9 @@ ) from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_answer_records.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_answer_records.py index eb4d7518a5d8..2a1551f79b91 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_answer_records.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_answer_records.py @@ -58,10 +58,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.answer_records import ( AnswerRecordsAsyncClient, AnswerRecordsClient, @@ -79,6 +75,9 @@ tool_call, ) from google.cloud.dialogflow_v2.types import answer_record as gcd_answer_record +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -3392,6 +3391,9 @@ def test_update_answer_record_rest_call_success(request_type): { "tool_call": { "tool": "tool_value", + "ces_tool": "ces_tool_value", + "ces_toolset": "ces_toolset_value", + "ces_app": "ces_app_value", "tool_display_name": "tool_display_name_value", "tool_display_details": "tool_display_details_value", "action": "action_value", @@ -3402,6 +3404,9 @@ def test_update_answer_record_rest_call_success(request_type): }, "tool_call_result": { "tool": "tool_value", + "ces_toolset": "ces_toolset_value", + "ces_tool": "ces_tool_value", + "ces_app": "ces_app_value", "action": "action_value", "error": {"message": "message_value"}, "raw_content": b"raw_content_blob", @@ -4409,10 +4414,65 @@ def test_parse_answer_record_path(): assert expected == actual -def test_context_path(): +def test_app_path(): project = "oyster" - session = "nudibranch" - context = "cuttlefish" + location = "nudibranch" + app = "cuttlefish" + expected = "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + actual = AnswerRecordsClient.app_path(project, location, app) + assert expected == actual + + +def test_parse_app_path(): + expected = { + "project": "mussel", + "location": "winkle", + "app": "nautilus", + } + path = AnswerRecordsClient.app_path(**expected) + + # Check that the path construction is reversible. + actual = AnswerRecordsClient.parse_app_path(path) + assert expected == actual + + +def test_ces_tool_path(): + project = "scallop" + location = "abalone" + app = "squid" + tool = "clam" + expected = "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + actual = AnswerRecordsClient.ces_tool_path(project, location, app, tool) + assert expected == actual + + +def test_parse_ces_tool_path(): + expected = { + "project": "whelk", + "location": "octopus", + "app": "oyster", + "tool": "nudibranch", + } + path = AnswerRecordsClient.ces_tool_path(**expected) + + # Check that the path construction is reversible. + actual = AnswerRecordsClient.parse_ces_tool_path(path) + assert expected == actual + + +def test_context_path(): + project = "cuttlefish" + session = "mussel" + context = "winkle" expected = "projects/{project}/agent/sessions/{session}/contexts/{context}".format( project=project, session=session, @@ -4424,9 +4484,9 @@ def test_context_path(): def test_parse_context_path(): expected = { - "project": "mussel", - "session": "winkle", - "context": "nautilus", + "project": "nautilus", + "session": "scallop", + "context": "abalone", } path = AnswerRecordsClient.context_path(**expected) @@ -4436,8 +4496,8 @@ def test_parse_context_path(): def test_intent_path(): - project = "scallop" - intent = "abalone" + project = "squid" + intent = "clam" expected = "projects/{project}/agent/intents/{intent}".format( project=project, intent=intent, @@ -4448,8 +4508,8 @@ def test_intent_path(): def test_parse_intent_path(): expected = { - "project": "squid", - "intent": "clam", + "project": "whelk", + "intent": "octopus", } path = AnswerRecordsClient.intent_path(**expected) @@ -4459,9 +4519,9 @@ def test_parse_intent_path(): def test_tool_path(): - project = "whelk" - location = "octopus" - tool = "oyster" + project = "oyster" + location = "nudibranch" + tool = "cuttlefish" expected = "projects/{project}/locations/{location}/tools/{tool}".format( project=project, location=location, @@ -4473,9 +4533,9 @@ def test_tool_path(): def test_parse_tool_path(): expected = { - "project": "nudibranch", - "location": "cuttlefish", - "tool": "mussel", + "project": "mussel", + "location": "winkle", + "tool": "nautilus", } path = AnswerRecordsClient.tool_path(**expected) @@ -4484,8 +4544,39 @@ def test_parse_tool_path(): assert expected == actual +def test_toolset_path(): + project = "scallop" + location = "abalone" + app = "squid" + toolset = "clam" + expected = ( + "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + ) + actual = AnswerRecordsClient.toolset_path(project, location, app, toolset) + assert expected == actual + + +def test_parse_toolset_path(): + expected = { + "project": "whelk", + "location": "octopus", + "app": "oyster", + "toolset": "nudibranch", + } + path = AnswerRecordsClient.toolset_path(**expected) + + # Check that the path construction is reversible. + actual = AnswerRecordsClient.parse_toolset_path(path) + assert expected == actual + + def test_common_billing_account_path(): - billing_account = "winkle" + billing_account = "cuttlefish" expected = "billingAccounts/{billing_account}".format( billing_account=billing_account, ) @@ -4495,7 +4586,7 @@ def test_common_billing_account_path(): def test_parse_common_billing_account_path(): expected = { - "billing_account": "nautilus", + "billing_account": "mussel", } path = AnswerRecordsClient.common_billing_account_path(**expected) @@ -4505,7 +4596,7 @@ def test_parse_common_billing_account_path(): def test_common_folder_path(): - folder = "scallop" + folder = "winkle" expected = "folders/{folder}".format( folder=folder, ) @@ -4515,7 +4606,7 @@ def test_common_folder_path(): def test_parse_common_folder_path(): expected = { - "folder": "abalone", + "folder": "nautilus", } path = AnswerRecordsClient.common_folder_path(**expected) @@ -4525,7 +4616,7 @@ def test_parse_common_folder_path(): def test_common_organization_path(): - organization = "squid" + organization = "scallop" expected = "organizations/{organization}".format( organization=organization, ) @@ -4535,7 +4626,7 @@ def test_common_organization_path(): def test_parse_common_organization_path(): expected = { - "organization": "clam", + "organization": "abalone", } path = AnswerRecordsClient.common_organization_path(**expected) @@ -4545,7 +4636,7 @@ def test_parse_common_organization_path(): def test_common_project_path(): - project = "whelk" + project = "squid" expected = "projects/{project}".format( project=project, ) @@ -4555,7 +4646,7 @@ def test_common_project_path(): def test_parse_common_project_path(): expected = { - "project": "octopus", + "project": "clam", } path = AnswerRecordsClient.common_project_path(**expected) @@ -4565,8 +4656,8 @@ def test_parse_common_project_path(): def test_common_location_path(): - project = "oyster" - location = "nudibranch" + project = "whelk" + location = "octopus" expected = "projects/{project}/locations/{location}".format( project=project, location=location, @@ -4577,8 +4668,8 @@ def test_common_location_path(): def test_parse_common_location_path(): expected = { - "project": "cuttlefish", - "location": "mussel", + "project": "oyster", + "location": "nudibranch", } path = AnswerRecordsClient.common_location_path(**expected) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_contexts.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_contexts.py index 22965bfdf6c1..91811124f5ac 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_contexts.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_contexts.py @@ -57,10 +57,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.contexts import ( ContextsAsyncClient, ContextsClient, @@ -69,6 +65,9 @@ ) from google.cloud.dialogflow_v2.types import context from google.cloud.dialogflow_v2.types import context as gcd_context +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_datasets.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_datasets.py index e46f3dc5315a..3b57f8aae0de 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_datasets.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_datasets.py @@ -61,10 +61,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.conversation_datasets import ( ConversationDatasetsAsyncClient, ConversationDatasetsClient, @@ -75,6 +71,9 @@ from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_models.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_models.py index b8377d924895..5dc687346fef 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_models.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_models.py @@ -61,10 +61,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.conversation_models import ( ConversationModelsAsyncClient, ConversationModelsClient, @@ -75,6 +71,9 @@ from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_profiles.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_profiles.py index 5943fbe7b2a1..a1fcfd6af1a9 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_profiles.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_profiles.py @@ -62,10 +62,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.conversation_profiles import ( ConversationProfilesAsyncClient, ConversationProfilesClient, @@ -81,6 +77,9 @@ from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -6467,6 +6466,7 @@ def test_create_conversation_profile_rest_call_success(request_type): "message_analysis_config": { "enable_entity_extraction": True, "enable_sentiment_analysis": True, + "enable_sentiment_analysis_v3": True, }, }, "human_agent_handoff_config": { @@ -6810,6 +6810,7 @@ def test_update_conversation_profile_rest_call_success(request_type): "message_analysis_config": { "enable_entity_extraction": True, "enable_sentiment_analysis": True, + "enable_sentiment_analysis_v3": True, }, }, "human_agent_handoff_config": { diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversations.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversations.py index 861494a5c48b..0c8f546012d6 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversations.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversations.py @@ -58,10 +58,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.conversations import ( ConversationsAsyncClient, ConversationsClient, @@ -71,14 +67,21 @@ from google.cloud.dialogflow_v2.types import ( agent_coaching_instruction, audio_config, + ces_app, + ces_tool, conversation, conversation_profile, generator, participant, session, + tool, tool_call, + toolset, ) from google.cloud.dialogflow_v2.types import conversation as gcd_conversation +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -8147,7 +8150,132 @@ def test_create_conversation_rest_call_success(request_type): {"mime_type": "mime_type_value", "content": b"content_blob"} ], }, + "initial_conversation_profile": { + "name": "name_value", + "display_name": "display_name_value", + "create_time": {}, + "update_time": {}, + "automated_agent_config": { + "agent": "agent_value", + "session_ttl": {"seconds": 751, "nanos": 543}, + }, + "human_agent_assistant_config": { + "notification_config": {"topic": "topic_value", "message_format": 1}, + "human_agent_suggestion_config": { + "feature_configs": [ + { + "suggestion_feature": {"type_": 1}, + "enable_event_based_suggestion": True, + "disable_agent_query_logging": True, + "enable_query_suggestion_when_no_answer": True, + "enable_conversation_augmented_query": True, + "enable_query_suggestion_only": True, + "enable_response_debug_info": True, + "rai_settings": { + "rai_category_configs": [ + {"category": 1, "sensitivity_level": 1} + ] + }, + "suggestion_trigger_settings": { + "no_smalltalk": True, + "only_end_user": True, + }, + "query_config": { + "knowledge_base_query_source": { + "knowledge_bases": [ + "knowledge_bases_value1", + "knowledge_bases_value2", + ] + }, + "document_query_source": { + "documents": [ + "documents_value1", + "documents_value2", + ] + }, + "dialogflow_query_source": { + "agent": "agent_value", + "human_agent_side_config": {"agent": "agent_value"}, + }, + "max_results": 1207, + "confidence_threshold": 0.2106, + "context_filter_settings": { + "drop_handoff_messages": True, + "drop_virtual_agent_messages": True, + "drop_ivr_messages": True, + }, + "sections": {"section_types": [1]}, + "context_size": 1311, + }, + "conversation_model_config": { + "model": "model_value", + "baseline_model_version": "baseline_model_version_value", + }, + "conversation_process_config": { + "recent_sentences_count": 2352 + }, + } + ], + "group_suggestion_responses": True, + "generators": ["generators_value1", "generators_value2"], + "disable_high_latency_features_sync_delivery": True, + "skip_empty_event_based_suggestion": True, + "use_unredacted_conversation_data": True, + "enable_async_tool_call": True, + }, + "end_user_suggestion_config": {}, + "message_analysis_config": { + "enable_entity_extraction": True, + "enable_sentiment_analysis": True, + "enable_sentiment_analysis_v3": True, + }, + }, + "human_agent_handoff_config": { + "live_person_config": {"account_number": "account_number_value"}, + "salesforce_live_agent_config": { + "organization_id": "organization_id_value", + "deployment_id": "deployment_id_value", + "button_id": "button_id_value", + "endpoint_domain": "endpoint_domain_value", + }, + }, + "notification_config": {}, + "logging_config": {"enable_stackdriver_logging": True}, + "new_message_event_notification_config": {}, + "new_recognition_result_notification_config": {}, + "stt_config": { + "speech_model_variant": 1, + "model": "model_value", + "phrase_sets": ["phrase_sets_value1", "phrase_sets_value2"], + "audio_encoding": 1, + "sample_rate_hertz": 1817, + "language_code": "language_code_value", + "enable_word_info": True, + "use_timeout_based_endpointing": True, + }, + "language_code": "language_code_value", + "time_zone": "time_zone_value", + "security_settings": "security_settings_value", + "tts_config": { + "speaking_rate": 0.1373, + "pitch": 0.536, + "volume_gain_db": 0.1467, + "effects_profile_id": [ + "effects_profile_id_value1", + "effects_profile_id_value2", + ], + "voice": {"name": "name_value", "ssml_gender": 1}, + "pronunciations": [ + { + "phrase": "phrase_value", + "phonetic_encoding": 1, + "pronunciation": "pronunciation_value", + } + ], + }, + }, "ingested_context_references": {}, + "initial_generator_contexts": {}, } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency @@ -10773,9 +10901,64 @@ def test_parse_answer_record_path(): assert expected == actual -def test_conversation_path(): +def test_app_path(): project = "cuttlefish" - conversation = "mussel" + location = "mussel" + app = "winkle" + expected = "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + actual = ConversationsClient.app_path(project, location, app) + assert expected == actual + + +def test_parse_app_path(): + expected = { + "project": "nautilus", + "location": "scallop", + "app": "abalone", + } + path = ConversationsClient.app_path(**expected) + + # Check that the path construction is reversible. + actual = ConversationsClient.parse_app_path(path) + assert expected == actual + + +def test_ces_tool_path(): + project = "squid" + location = "clam" + app = "whelk" + tool = "octopus" + expected = "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + actual = ConversationsClient.ces_tool_path(project, location, app, tool) + assert expected == actual + + +def test_parse_ces_tool_path(): + expected = { + "project": "oyster", + "location": "nudibranch", + "app": "cuttlefish", + "tool": "mussel", + } + path = ConversationsClient.ces_tool_path(**expected) + + # Check that the path construction is reversible. + actual = ConversationsClient.parse_ces_tool_path(path) + assert expected == actual + + +def test_conversation_path(): + project = "winkle" + conversation = "nautilus" expected = "projects/{project}/conversations/{conversation}".format( project=project, conversation=conversation, @@ -10786,8 +10969,8 @@ def test_conversation_path(): def test_parse_conversation_path(): expected = { - "project": "winkle", - "conversation": "nautilus", + "project": "scallop", + "conversation": "abalone", } path = ConversationsClient.conversation_path(**expected) @@ -10797,9 +10980,9 @@ def test_parse_conversation_path(): def test_conversation_model_path(): - project = "scallop" - location = "abalone" - conversation_model = "squid" + project = "squid" + location = "clam" + conversation_model = "whelk" expected = "projects/{project}/locations/{location}/conversationModels/{conversation_model}".format( project=project, location=location, @@ -10813,9 +10996,9 @@ def test_conversation_model_path(): def test_parse_conversation_model_path(): expected = { - "project": "clam", - "location": "whelk", - "conversation_model": "octopus", + "project": "octopus", + "location": "oyster", + "conversation_model": "nudibranch", } path = ConversationsClient.conversation_model_path(**expected) @@ -10825,8 +11008,8 @@ def test_parse_conversation_model_path(): def test_conversation_profile_path(): - project = "oyster" - conversation_profile = "nudibranch" + project = "cuttlefish" + conversation_profile = "mussel" expected = "projects/{project}/conversationProfiles/{conversation_profile}".format( project=project, conversation_profile=conversation_profile, @@ -10839,8 +11022,8 @@ def test_conversation_profile_path(): def test_parse_conversation_profile_path(): expected = { - "project": "cuttlefish", - "conversation_profile": "mussel", + "project": "winkle", + "conversation_profile": "nautilus", } path = ConversationsClient.conversation_profile_path(**expected) @@ -10850,9 +11033,9 @@ def test_parse_conversation_profile_path(): def test_cx_security_settings_path(): - project = "winkle" - location = "nautilus" - security_settings = "scallop" + project = "scallop" + location = "abalone" + security_settings = "squid" expected = "projects/{project}/locations/{location}/securitySettings/{security_settings}".format( project=project, location=location, @@ -10866,9 +11049,9 @@ def test_cx_security_settings_path(): def test_parse_cx_security_settings_path(): expected = { - "project": "abalone", - "location": "squid", - "security_settings": "clam", + "project": "clam", + "location": "whelk", + "security_settings": "octopus", } path = ConversationsClient.cx_security_settings_path(**expected) @@ -10878,10 +11061,10 @@ def test_parse_cx_security_settings_path(): def test_data_store_path(): - project = "whelk" - location = "octopus" - collection = "oyster" - data_store = "nudibranch" + project = "oyster" + location = "nudibranch" + collection = "cuttlefish" + data_store = "mussel" expected = "projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store}".format( project=project, location=location, @@ -10896,10 +11079,10 @@ def test_data_store_path(): def test_parse_data_store_path(): expected = { - "project": "cuttlefish", - "location": "mussel", - "collection": "winkle", - "data_store": "nautilus", + "project": "winkle", + "location": "nautilus", + "collection": "scallop", + "data_store": "abalone", } path = ConversationsClient.data_store_path(**expected) @@ -10909,9 +11092,9 @@ def test_parse_data_store_path(): def test_document_path(): - project = "scallop" - knowledge_base = "abalone" - document = "squid" + project = "squid" + knowledge_base = "clam" + document = "whelk" expected = "projects/{project}/knowledgeBases/{knowledge_base}/documents/{document}".format( project=project, knowledge_base=knowledge_base, @@ -10923,9 +11106,9 @@ def test_document_path(): def test_parse_document_path(): expected = { - "project": "clam", - "knowledge_base": "whelk", - "document": "octopus", + "project": "octopus", + "knowledge_base": "oyster", + "document": "nudibranch", } path = ConversationsClient.document_path(**expected) @@ -10935,9 +11118,9 @@ def test_parse_document_path(): def test_generator_path(): - project = "oyster" - location = "nudibranch" - generator = "cuttlefish" + project = "cuttlefish" + location = "mussel" + generator = "winkle" expected = "projects/{project}/locations/{location}/generators/{generator}".format( project=project, location=location, @@ -10949,9 +11132,9 @@ def test_generator_path(): def test_parse_generator_path(): expected = { - "project": "mussel", - "location": "winkle", - "generator": "nautilus", + "project": "nautilus", + "location": "scallop", + "generator": "abalone", } path = ConversationsClient.generator_path(**expected) @@ -10961,8 +11144,8 @@ def test_parse_generator_path(): def test_knowledge_base_path(): - project = "scallop" - knowledge_base = "abalone" + project = "squid" + knowledge_base = "clam" expected = "projects/{project}/knowledgeBases/{knowledge_base}".format( project=project, knowledge_base=knowledge_base, @@ -10973,8 +11156,8 @@ def test_knowledge_base_path(): def test_parse_knowledge_base_path(): expected = { - "project": "squid", - "knowledge_base": "clam", + "project": "whelk", + "knowledge_base": "octopus", } path = ConversationsClient.knowledge_base_path(**expected) @@ -10984,9 +11167,9 @@ def test_parse_knowledge_base_path(): def test_message_path(): - project = "whelk" - conversation = "octopus" - message = "oyster" + project = "oyster" + conversation = "nudibranch" + message = "cuttlefish" expected = ( "projects/{project}/conversations/{conversation}/messages/{message}".format( project=project, @@ -11000,9 +11183,9 @@ def test_message_path(): def test_parse_message_path(): expected = { - "project": "nudibranch", - "conversation": "cuttlefish", - "message": "mussel", + "project": "mussel", + "conversation": "winkle", + "message": "nautilus", } path = ConversationsClient.message_path(**expected) @@ -11012,9 +11195,9 @@ def test_parse_message_path(): def test_phrase_set_path(): - project = "winkle" - location = "nautilus" - phrase_set = "scallop" + project = "scallop" + location = "abalone" + phrase_set = "squid" expected = "projects/{project}/locations/{location}/phraseSets/{phrase_set}".format( project=project, location=location, @@ -11026,9 +11209,9 @@ def test_phrase_set_path(): def test_parse_phrase_set_path(): expected = { - "project": "abalone", - "location": "squid", - "phrase_set": "clam", + "project": "clam", + "location": "whelk", + "phrase_set": "octopus", } path = ConversationsClient.phrase_set_path(**expected) @@ -11038,9 +11221,9 @@ def test_parse_phrase_set_path(): def test_tool_path(): - project = "whelk" - location = "octopus" - tool = "oyster" + project = "oyster" + location = "nudibranch" + tool = "cuttlefish" expected = "projects/{project}/locations/{location}/tools/{tool}".format( project=project, location=location, @@ -11052,9 +11235,9 @@ def test_tool_path(): def test_parse_tool_path(): expected = { - "project": "nudibranch", - "location": "cuttlefish", - "tool": "mussel", + "project": "mussel", + "location": "winkle", + "tool": "nautilus", } path = ConversationsClient.tool_path(**expected) @@ -11063,8 +11246,39 @@ def test_parse_tool_path(): assert expected == actual +def test_toolset_path(): + project = "scallop" + location = "abalone" + app = "squid" + toolset = "clam" + expected = ( + "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + ) + actual = ConversationsClient.toolset_path(project, location, app, toolset) + assert expected == actual + + +def test_parse_toolset_path(): + expected = { + "project": "whelk", + "location": "octopus", + "app": "oyster", + "toolset": "nudibranch", + } + path = ConversationsClient.toolset_path(**expected) + + # Check that the path construction is reversible. + actual = ConversationsClient.parse_toolset_path(path) + assert expected == actual + + def test_common_billing_account_path(): - billing_account = "winkle" + billing_account = "cuttlefish" expected = "billingAccounts/{billing_account}".format( billing_account=billing_account, ) @@ -11074,7 +11288,7 @@ def test_common_billing_account_path(): def test_parse_common_billing_account_path(): expected = { - "billing_account": "nautilus", + "billing_account": "mussel", } path = ConversationsClient.common_billing_account_path(**expected) @@ -11084,7 +11298,7 @@ def test_parse_common_billing_account_path(): def test_common_folder_path(): - folder = "scallop" + folder = "winkle" expected = "folders/{folder}".format( folder=folder, ) @@ -11094,7 +11308,7 @@ def test_common_folder_path(): def test_parse_common_folder_path(): expected = { - "folder": "abalone", + "folder": "nautilus", } path = ConversationsClient.common_folder_path(**expected) @@ -11104,7 +11318,7 @@ def test_parse_common_folder_path(): def test_common_organization_path(): - organization = "squid" + organization = "scallop" expected = "organizations/{organization}".format( organization=organization, ) @@ -11114,7 +11328,7 @@ def test_common_organization_path(): def test_parse_common_organization_path(): expected = { - "organization": "clam", + "organization": "abalone", } path = ConversationsClient.common_organization_path(**expected) @@ -11124,7 +11338,7 @@ def test_parse_common_organization_path(): def test_common_project_path(): - project = "whelk" + project = "squid" expected = "projects/{project}".format( project=project, ) @@ -11134,7 +11348,7 @@ def test_common_project_path(): def test_parse_common_project_path(): expected = { - "project": "octopus", + "project": "clam", } path = ConversationsClient.common_project_path(**expected) @@ -11144,8 +11358,8 @@ def test_parse_common_project_path(): def test_common_location_path(): - project = "oyster" - location = "nudibranch" + project = "whelk" + location = "octopus" expected = "projects/{project}/locations/{location}".format( project=project, location=location, @@ -11156,8 +11370,8 @@ def test_common_location_path(): def test_parse_common_location_path(): expected = { - "project": "cuttlefish", - "location": "mussel", + "project": "oyster", + "location": "nudibranch", } path = ConversationsClient.common_location_path(**expected) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_documents.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_documents.py index 2ef271e07419..6989ef5815ea 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_documents.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_documents.py @@ -64,10 +64,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.documents import ( DocumentsAsyncClient, DocumentsClient, @@ -76,6 +72,9 @@ ) from google.cloud.dialogflow_v2.types import document, gcs from google.cloud.dialogflow_v2.types import document as gcd_document +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_encryption_spec_service.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_encryption_spec_service.py index 6c03094ff655..98a9e81e0f27 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_encryption_spec_service.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_encryption_spec_service.py @@ -59,10 +59,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.encryption_spec_service import ( EncryptionSpecServiceAsyncClient, EncryptionSpecServiceClient, @@ -70,6 +66,9 @@ ) from google.cloud.dialogflow_v2.types import encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_entity_types.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_entity_types.py index 571a34814aa0..80507e9223d2 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_entity_types.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_entity_types.py @@ -62,10 +62,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.entity_types import ( EntityTypesAsyncClient, EntityTypesClient, @@ -74,6 +70,9 @@ ) from google.cloud.dialogflow_v2.types import entity_type from google.cloud.dialogflow_v2.types import entity_type as gcd_entity_type +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_environments.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_environments.py index 674962b5afa8..7fe6b76178ce 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_environments.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_environments.py @@ -57,10 +57,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.environments import ( EnvironmentsAsyncClient, EnvironmentsClient, @@ -68,6 +64,9 @@ transports, ) from google.cloud.dialogflow_v2.types import audio_config, environment, fulfillment +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_fulfillments.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_fulfillments.py index da85b5bdd20e..75714c8a9127 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_fulfillments.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_fulfillments.py @@ -56,10 +56,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.fulfillments import ( FulfillmentsAsyncClient, FulfillmentsClient, @@ -67,6 +63,9 @@ ) from google.cloud.dialogflow_v2.types import fulfillment from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generator_evaluations.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generator_evaluations.py index bfd7170a00cc..bb058bd3fcb1 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generator_evaluations.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generator_evaluations.py @@ -63,10 +63,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.generator_evaluations import ( GeneratorEvaluationsAsyncClient, GeneratorEvaluationsClient, @@ -75,14 +71,21 @@ ) from google.cloud.dialogflow_v2.types import ( agent_coaching_instruction, + ces_app, + ces_tool, generator, generator_evaluation, operations, + tool, tool_call, + toolset, ) from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -4320,6 +4323,9 @@ def test_create_generator_evaluation_rest_call_success(request_type): { "tool_call": { "tool": "tool_value", + "ces_tool": "ces_tool_value", + "ces_toolset": "ces_toolset_value", + "ces_app": "ces_app_value", "tool_display_name": "tool_display_name_value", "tool_display_details": "tool_display_details_value", "action": "action_value", @@ -4330,6 +4336,9 @@ def test_create_generator_evaluation_rest_call_success(request_type): }, "tool_call_result": { "tool": "tool_value", + "ces_toolset": "ces_toolset_value", + "ces_tool": "ces_tool_value", + "ces_app": "ces_app_value", "action": "action_value", "error": {"message": "message_value"}, "raw_content": b"raw_content_blob", @@ -4360,6 +4369,19 @@ def test_create_generator_evaluation_rest_call_success(request_type): "enable_deduping": True, "similarity_threshold": 0.21630000000000002, }, + "toolset_tools": [ + { + "toolset": "toolset_value", + "operation_id": "operation_id_value", + "confirmation_requirement": 1, + } + ], + "ces_tool_specs": [ + {"ces_tool": "ces_tool_value", "confirmation_requirement": 1} + ], + "ces_app_specs": [ + {"ces_app": "ces_app_value", "confirmation_requirement": 1} + ], }, "summarization_metrics": { "summarization_evaluation_results": [ @@ -5926,10 +5948,65 @@ def test_generator_evaluations_grpc_lro_async_client(): assert transport.operations_client is transport.operations_client -def test_generator_path(): +def test_app_path(): project = "squid" location = "clam" - generator = "whelk" + app = "whelk" + expected = "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + actual = GeneratorEvaluationsClient.app_path(project, location, app) + assert expected == actual + + +def test_parse_app_path(): + expected = { + "project": "octopus", + "location": "oyster", + "app": "nudibranch", + } + path = GeneratorEvaluationsClient.app_path(**expected) + + # Check that the path construction is reversible. + actual = GeneratorEvaluationsClient.parse_app_path(path) + assert expected == actual + + +def test_ces_tool_path(): + project = "cuttlefish" + location = "mussel" + app = "winkle" + tool = "nautilus" + expected = "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + actual = GeneratorEvaluationsClient.ces_tool_path(project, location, app, tool) + assert expected == actual + + +def test_parse_ces_tool_path(): + expected = { + "project": "scallop", + "location": "abalone", + "app": "squid", + "tool": "clam", + } + path = GeneratorEvaluationsClient.ces_tool_path(**expected) + + # Check that the path construction is reversible. + actual = GeneratorEvaluationsClient.parse_ces_tool_path(path) + assert expected == actual + + +def test_generator_path(): + project = "whelk" + location = "octopus" + generator = "oyster" expected = "projects/{project}/locations/{location}/generators/{generator}".format( project=project, location=location, @@ -5941,9 +6018,9 @@ def test_generator_path(): def test_parse_generator_path(): expected = { - "project": "octopus", - "location": "oyster", - "generator": "nudibranch", + "project": "nudibranch", + "location": "cuttlefish", + "generator": "mussel", } path = GeneratorEvaluationsClient.generator_path(**expected) @@ -5953,10 +6030,10 @@ def test_parse_generator_path(): def test_generator_evaluation_path(): - project = "cuttlefish" - location = "mussel" - generator = "winkle" - evaluation = "nautilus" + project = "winkle" + location = "nautilus" + generator = "scallop" + evaluation = "abalone" expected = "projects/{project}/locations/{location}/generators/{generator}/evaluations/{evaluation}".format( project=project, location=location, @@ -5971,10 +6048,10 @@ def test_generator_evaluation_path(): def test_parse_generator_evaluation_path(): expected = { - "project": "scallop", - "location": "abalone", - "generator": "squid", - "evaluation": "clam", + "project": "squid", + "location": "clam", + "generator": "whelk", + "evaluation": "octopus", } path = GeneratorEvaluationsClient.generator_evaluation_path(**expected) @@ -5984,9 +6061,9 @@ def test_parse_generator_evaluation_path(): def test_tool_path(): - project = "whelk" - location = "octopus" - tool = "oyster" + project = "oyster" + location = "nudibranch" + tool = "cuttlefish" expected = "projects/{project}/locations/{location}/tools/{tool}".format( project=project, location=location, @@ -5998,9 +6075,9 @@ def test_tool_path(): def test_parse_tool_path(): expected = { - "project": "nudibranch", - "location": "cuttlefish", - "tool": "mussel", + "project": "mussel", + "location": "winkle", + "tool": "nautilus", } path = GeneratorEvaluationsClient.tool_path(**expected) @@ -6009,8 +6086,39 @@ def test_parse_tool_path(): assert expected == actual +def test_toolset_path(): + project = "scallop" + location = "abalone" + app = "squid" + toolset = "clam" + expected = ( + "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + ) + actual = GeneratorEvaluationsClient.toolset_path(project, location, app, toolset) + assert expected == actual + + +def test_parse_toolset_path(): + expected = { + "project": "whelk", + "location": "octopus", + "app": "oyster", + "toolset": "nudibranch", + } + path = GeneratorEvaluationsClient.toolset_path(**expected) + + # Check that the path construction is reversible. + actual = GeneratorEvaluationsClient.parse_toolset_path(path) + assert expected == actual + + def test_common_billing_account_path(): - billing_account = "winkle" + billing_account = "cuttlefish" expected = "billingAccounts/{billing_account}".format( billing_account=billing_account, ) @@ -6020,7 +6128,7 @@ def test_common_billing_account_path(): def test_parse_common_billing_account_path(): expected = { - "billing_account": "nautilus", + "billing_account": "mussel", } path = GeneratorEvaluationsClient.common_billing_account_path(**expected) @@ -6030,7 +6138,7 @@ def test_parse_common_billing_account_path(): def test_common_folder_path(): - folder = "scallop" + folder = "winkle" expected = "folders/{folder}".format( folder=folder, ) @@ -6040,7 +6148,7 @@ def test_common_folder_path(): def test_parse_common_folder_path(): expected = { - "folder": "abalone", + "folder": "nautilus", } path = GeneratorEvaluationsClient.common_folder_path(**expected) @@ -6050,7 +6158,7 @@ def test_parse_common_folder_path(): def test_common_organization_path(): - organization = "squid" + organization = "scallop" expected = "organizations/{organization}".format( organization=organization, ) @@ -6060,7 +6168,7 @@ def test_common_organization_path(): def test_parse_common_organization_path(): expected = { - "organization": "clam", + "organization": "abalone", } path = GeneratorEvaluationsClient.common_organization_path(**expected) @@ -6070,7 +6178,7 @@ def test_parse_common_organization_path(): def test_common_project_path(): - project = "whelk" + project = "squid" expected = "projects/{project}".format( project=project, ) @@ -6080,7 +6188,7 @@ def test_common_project_path(): def test_parse_common_project_path(): expected = { - "project": "octopus", + "project": "clam", } path = GeneratorEvaluationsClient.common_project_path(**expected) @@ -6090,8 +6198,8 @@ def test_parse_common_project_path(): def test_common_location_path(): - project = "oyster" - location = "nudibranch" + project = "whelk" + location = "octopus" expected = "projects/{project}/locations/{location}".format( project=project, location=location, @@ -6102,8 +6210,8 @@ def test_common_location_path(): def test_parse_common_location_path(): expected = { - "project": "cuttlefish", - "location": "mussel", + "project": "oyster", + "location": "nudibranch", } path = GeneratorEvaluationsClient.common_location_path(**expected) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generators.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generators.py index bd8a0c9ee9fd..5f76747debbc 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generators.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generators.py @@ -58,10 +58,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.generators import ( GeneratorsAsyncClient, GeneratorsClient, @@ -70,10 +66,17 @@ ) from google.cloud.dialogflow_v2.types import ( agent_coaching_instruction, + ces_app, + ces_tool, generator, + tool, tool_call, + toolset, ) from google.cloud.dialogflow_v2.types import generator as gcd_generator +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -4631,6 +4634,9 @@ def test_create_generator_rest_call_success(request_type): { "tool_call": { "tool": "tool_value", + "ces_tool": "ces_tool_value", + "ces_toolset": "ces_toolset_value", + "ces_app": "ces_app_value", "tool_display_name": "tool_display_name_value", "tool_display_details": "tool_display_details_value", "action": "action_value", @@ -4641,6 +4647,9 @@ def test_create_generator_rest_call_success(request_type): }, "tool_call_result": { "tool": "tool_value", + "ces_toolset": "ces_toolset_value", + "ces_tool": "ces_tool_value", + "ces_app": "ces_app_value", "action": "action_value", "error": {"message": "message_value"}, "raw_content": b"raw_content_blob", @@ -4671,6 +4680,17 @@ def test_create_generator_rest_call_success(request_type): "enable_deduping": True, "similarity_threshold": 0.21630000000000002, }, + "toolset_tools": [ + { + "toolset": "toolset_value", + "operation_id": "operation_id_value", + "confirmation_requirement": 1, + } + ], + "ces_tool_specs": [ + {"ces_tool": "ces_tool_value", "confirmation_requirement": 1} + ], + "ces_app_specs": [{"ces_app": "ces_app_value", "confirmation_requirement": 1}], } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency @@ -5336,6 +5356,9 @@ def test_update_generator_rest_call_success(request_type): { "tool_call": { "tool": "tool_value", + "ces_tool": "ces_tool_value", + "ces_toolset": "ces_toolset_value", + "ces_app": "ces_app_value", "tool_display_name": "tool_display_name_value", "tool_display_details": "tool_display_details_value", "action": "action_value", @@ -5346,6 +5369,9 @@ def test_update_generator_rest_call_success(request_type): }, "tool_call_result": { "tool": "tool_value", + "ces_toolset": "ces_toolset_value", + "ces_tool": "ces_tool_value", + "ces_app": "ces_app_value", "action": "action_value", "error": {"message": "message_value"}, "raw_content": b"raw_content_blob", @@ -5376,6 +5402,17 @@ def test_update_generator_rest_call_success(request_type): "enable_deduping": True, "similarity_threshold": 0.21630000000000002, }, + "toolset_tools": [ + { + "toolset": "toolset_value", + "operation_id": "operation_id_value", + "confirmation_requirement": 1, + } + ], + "ces_tool_specs": [ + {"ces_tool": "ces_tool_value", "confirmation_requirement": 1} + ], + "ces_app_specs": [{"ces_app": "ces_app_value", "confirmation_requirement": 1}], } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency @@ -6410,10 +6447,65 @@ def test_generators_transport_channel_mtls_with_adc(transport_class): assert transport.grpc_channel == mock_grpc_channel -def test_generator_path(): +def test_app_path(): project = "squid" location = "clam" - generator = "whelk" + app = "whelk" + expected = "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + actual = GeneratorsClient.app_path(project, location, app) + assert expected == actual + + +def test_parse_app_path(): + expected = { + "project": "octopus", + "location": "oyster", + "app": "nudibranch", + } + path = GeneratorsClient.app_path(**expected) + + # Check that the path construction is reversible. + actual = GeneratorsClient.parse_app_path(path) + assert expected == actual + + +def test_ces_tool_path(): + project = "cuttlefish" + location = "mussel" + app = "winkle" + tool = "nautilus" + expected = "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + actual = GeneratorsClient.ces_tool_path(project, location, app, tool) + assert expected == actual + + +def test_parse_ces_tool_path(): + expected = { + "project": "scallop", + "location": "abalone", + "app": "squid", + "tool": "clam", + } + path = GeneratorsClient.ces_tool_path(**expected) + + # Check that the path construction is reversible. + actual = GeneratorsClient.parse_ces_tool_path(path) + assert expected == actual + + +def test_generator_path(): + project = "whelk" + location = "octopus" + generator = "oyster" expected = "projects/{project}/locations/{location}/generators/{generator}".format( project=project, location=location, @@ -6425,9 +6517,9 @@ def test_generator_path(): def test_parse_generator_path(): expected = { - "project": "octopus", - "location": "oyster", - "generator": "nudibranch", + "project": "nudibranch", + "location": "cuttlefish", + "generator": "mussel", } path = GeneratorsClient.generator_path(**expected) @@ -6437,9 +6529,9 @@ def test_parse_generator_path(): def test_tool_path(): - project = "cuttlefish" - location = "mussel" - tool = "winkle" + project = "winkle" + location = "nautilus" + tool = "scallop" expected = "projects/{project}/locations/{location}/tools/{tool}".format( project=project, location=location, @@ -6451,9 +6543,9 @@ def test_tool_path(): def test_parse_tool_path(): expected = { - "project": "nautilus", - "location": "scallop", - "tool": "abalone", + "project": "abalone", + "location": "squid", + "tool": "clam", } path = GeneratorsClient.tool_path(**expected) @@ -6462,8 +6554,39 @@ def test_parse_tool_path(): assert expected == actual +def test_toolset_path(): + project = "whelk" + location = "octopus" + app = "oyster" + toolset = "nudibranch" + expected = ( + "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + ) + actual = GeneratorsClient.toolset_path(project, location, app, toolset) + assert expected == actual + + +def test_parse_toolset_path(): + expected = { + "project": "cuttlefish", + "location": "mussel", + "app": "winkle", + "toolset": "nautilus", + } + path = GeneratorsClient.toolset_path(**expected) + + # Check that the path construction is reversible. + actual = GeneratorsClient.parse_toolset_path(path) + assert expected == actual + + def test_common_billing_account_path(): - billing_account = "squid" + billing_account = "scallop" expected = "billingAccounts/{billing_account}".format( billing_account=billing_account, ) @@ -6473,7 +6596,7 @@ def test_common_billing_account_path(): def test_parse_common_billing_account_path(): expected = { - "billing_account": "clam", + "billing_account": "abalone", } path = GeneratorsClient.common_billing_account_path(**expected) @@ -6483,7 +6606,7 @@ def test_parse_common_billing_account_path(): def test_common_folder_path(): - folder = "whelk" + folder = "squid" expected = "folders/{folder}".format( folder=folder, ) @@ -6493,7 +6616,7 @@ def test_common_folder_path(): def test_parse_common_folder_path(): expected = { - "folder": "octopus", + "folder": "clam", } path = GeneratorsClient.common_folder_path(**expected) @@ -6503,7 +6626,7 @@ def test_parse_common_folder_path(): def test_common_organization_path(): - organization = "oyster" + organization = "whelk" expected = "organizations/{organization}".format( organization=organization, ) @@ -6513,7 +6636,7 @@ def test_common_organization_path(): def test_parse_common_organization_path(): expected = { - "organization": "nudibranch", + "organization": "octopus", } path = GeneratorsClient.common_organization_path(**expected) @@ -6523,7 +6646,7 @@ def test_parse_common_organization_path(): def test_common_project_path(): - project = "cuttlefish" + project = "oyster" expected = "projects/{project}".format( project=project, ) @@ -6533,7 +6656,7 @@ def test_common_project_path(): def test_parse_common_project_path(): expected = { - "project": "mussel", + "project": "nudibranch", } path = GeneratorsClient.common_project_path(**expected) @@ -6543,8 +6666,8 @@ def test_parse_common_project_path(): def test_common_location_path(): - project = "winkle" - location = "nautilus" + project = "cuttlefish" + location = "mussel" expected = "projects/{project}/locations/{location}".format( project=project, location=location, @@ -6555,8 +6678,8 @@ def test_common_location_path(): def test_parse_common_location_path(): expected = { - "project": "scallop", - "location": "abalone", + "project": "winkle", + "location": "nautilus", } path = GeneratorsClient.common_location_path(**expected) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_intents.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_intents.py index 859a584ca92a..2ec0c775baec 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_intents.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_intents.py @@ -62,10 +62,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.intents import ( IntentsAsyncClient, IntentsClient, @@ -74,6 +70,9 @@ ) from google.cloud.dialogflow_v2.types import context, intent from google.cloud.dialogflow_v2.types import intent as gcd_intent +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_knowledge_bases.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_knowledge_bases.py index f45a24618811..fd79c64281b3 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_knowledge_bases.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_knowledge_bases.py @@ -56,10 +56,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.knowledge_bases import ( KnowledgeBasesAsyncClient, KnowledgeBasesClient, @@ -68,6 +64,9 @@ ) from google.cloud.dialogflow_v2.types import knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_participants.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_participants.py index 962ac7ab2177..2d8468cd7e05 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_participants.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_participants.py @@ -59,10 +59,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.participants import ( ParticipantsAsyncClient, ParticipantsClient, @@ -78,6 +74,9 @@ session_entity_type, ) from google.cloud.dialogflow_v2.types import participant as gcd_participant +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -9518,10 +9517,65 @@ def test_parse_answer_record_path(): assert expected == actual -def test_context_path(): +def test_app_path(): project = "oyster" - session = "nudibranch" - context = "cuttlefish" + location = "nudibranch" + app = "cuttlefish" + expected = "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + actual = ParticipantsClient.app_path(project, location, app) + assert expected == actual + + +def test_parse_app_path(): + expected = { + "project": "mussel", + "location": "winkle", + "app": "nautilus", + } + path = ParticipantsClient.app_path(**expected) + + # Check that the path construction is reversible. + actual = ParticipantsClient.parse_app_path(path) + assert expected == actual + + +def test_ces_tool_path(): + project = "scallop" + location = "abalone" + app = "squid" + tool = "clam" + expected = "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + actual = ParticipantsClient.ces_tool_path(project, location, app, tool) + assert expected == actual + + +def test_parse_ces_tool_path(): + expected = { + "project": "whelk", + "location": "octopus", + "app": "oyster", + "tool": "nudibranch", + } + path = ParticipantsClient.ces_tool_path(**expected) + + # Check that the path construction is reversible. + actual = ParticipantsClient.parse_ces_tool_path(path) + assert expected == actual + + +def test_context_path(): + project = "cuttlefish" + session = "mussel" + context = "winkle" expected = "projects/{project}/agent/sessions/{session}/contexts/{context}".format( project=project, session=session, @@ -9533,9 +9587,9 @@ def test_context_path(): def test_parse_context_path(): expected = { - "project": "mussel", - "session": "winkle", - "context": "nautilus", + "project": "nautilus", + "session": "scallop", + "context": "abalone", } path = ParticipantsClient.context_path(**expected) @@ -9545,8 +9599,8 @@ def test_parse_context_path(): def test_intent_path(): - project = "scallop" - intent = "abalone" + project = "squid" + intent = "clam" expected = "projects/{project}/agent/intents/{intent}".format( project=project, intent=intent, @@ -9557,8 +9611,8 @@ def test_intent_path(): def test_parse_intent_path(): expected = { - "project": "squid", - "intent": "clam", + "project": "whelk", + "intent": "octopus", } path = ParticipantsClient.intent_path(**expected) @@ -9568,9 +9622,9 @@ def test_parse_intent_path(): def test_message_path(): - project = "whelk" - conversation = "octopus" - message = "oyster" + project = "oyster" + conversation = "nudibranch" + message = "cuttlefish" expected = ( "projects/{project}/conversations/{conversation}/messages/{message}".format( project=project, @@ -9584,9 +9638,9 @@ def test_message_path(): def test_parse_message_path(): expected = { - "project": "nudibranch", - "conversation": "cuttlefish", - "message": "mussel", + "project": "mussel", + "conversation": "winkle", + "message": "nautilus", } path = ParticipantsClient.message_path(**expected) @@ -9596,9 +9650,9 @@ def test_parse_message_path(): def test_participant_path(): - project = "winkle" - conversation = "nautilus" - participant = "scallop" + project = "scallop" + conversation = "abalone" + participant = "squid" expected = "projects/{project}/conversations/{conversation}/participants/{participant}".format( project=project, conversation=conversation, @@ -9610,9 +9664,9 @@ def test_participant_path(): def test_parse_participant_path(): expected = { - "project": "abalone", - "conversation": "squid", - "participant": "clam", + "project": "clam", + "conversation": "whelk", + "participant": "octopus", } path = ParticipantsClient.participant_path(**expected) @@ -9622,9 +9676,9 @@ def test_parse_participant_path(): def test_phrase_set_path(): - project = "whelk" - location = "octopus" - phrase_set = "oyster" + project = "oyster" + location = "nudibranch" + phrase_set = "cuttlefish" expected = "projects/{project}/locations/{location}/phraseSets/{phrase_set}".format( project=project, location=location, @@ -9636,9 +9690,9 @@ def test_phrase_set_path(): def test_parse_phrase_set_path(): expected = { - "project": "nudibranch", - "location": "cuttlefish", - "phrase_set": "mussel", + "project": "mussel", + "location": "winkle", + "phrase_set": "nautilus", } path = ParticipantsClient.phrase_set_path(**expected) @@ -9648,9 +9702,9 @@ def test_parse_phrase_set_path(): def test_session_entity_type_path(): - project = "winkle" - session = "nautilus" - entity_type = "scallop" + project = "scallop" + session = "abalone" + entity_type = "squid" expected = ( "projects/{project}/agent/sessions/{session}/entityTypes/{entity_type}".format( project=project, @@ -9664,9 +9718,9 @@ def test_session_entity_type_path(): def test_parse_session_entity_type_path(): expected = { - "project": "abalone", - "session": "squid", - "entity_type": "clam", + "project": "clam", + "session": "whelk", + "entity_type": "octopus", } path = ParticipantsClient.session_entity_type_path(**expected) @@ -9676,9 +9730,9 @@ def test_parse_session_entity_type_path(): def test_tool_path(): - project = "whelk" - location = "octopus" - tool = "oyster" + project = "oyster" + location = "nudibranch" + tool = "cuttlefish" expected = "projects/{project}/locations/{location}/tools/{tool}".format( project=project, location=location, @@ -9690,9 +9744,9 @@ def test_tool_path(): def test_parse_tool_path(): expected = { - "project": "nudibranch", - "location": "cuttlefish", - "tool": "mussel", + "project": "mussel", + "location": "winkle", + "tool": "nautilus", } path = ParticipantsClient.tool_path(**expected) @@ -9701,8 +9755,39 @@ def test_parse_tool_path(): assert expected == actual +def test_toolset_path(): + project = "scallop" + location = "abalone" + app = "squid" + toolset = "clam" + expected = ( + "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + ) + actual = ParticipantsClient.toolset_path(project, location, app, toolset) + assert expected == actual + + +def test_parse_toolset_path(): + expected = { + "project": "whelk", + "location": "octopus", + "app": "oyster", + "toolset": "nudibranch", + } + path = ParticipantsClient.toolset_path(**expected) + + # Check that the path construction is reversible. + actual = ParticipantsClient.parse_toolset_path(path) + assert expected == actual + + def test_common_billing_account_path(): - billing_account = "winkle" + billing_account = "cuttlefish" expected = "billingAccounts/{billing_account}".format( billing_account=billing_account, ) @@ -9712,7 +9797,7 @@ def test_common_billing_account_path(): def test_parse_common_billing_account_path(): expected = { - "billing_account": "nautilus", + "billing_account": "mussel", } path = ParticipantsClient.common_billing_account_path(**expected) @@ -9722,7 +9807,7 @@ def test_parse_common_billing_account_path(): def test_common_folder_path(): - folder = "scallop" + folder = "winkle" expected = "folders/{folder}".format( folder=folder, ) @@ -9732,7 +9817,7 @@ def test_common_folder_path(): def test_parse_common_folder_path(): expected = { - "folder": "abalone", + "folder": "nautilus", } path = ParticipantsClient.common_folder_path(**expected) @@ -9742,7 +9827,7 @@ def test_parse_common_folder_path(): def test_common_organization_path(): - organization = "squid" + organization = "scallop" expected = "organizations/{organization}".format( organization=organization, ) @@ -9752,7 +9837,7 @@ def test_common_organization_path(): def test_parse_common_organization_path(): expected = { - "organization": "clam", + "organization": "abalone", } path = ParticipantsClient.common_organization_path(**expected) @@ -9762,7 +9847,7 @@ def test_parse_common_organization_path(): def test_common_project_path(): - project = "whelk" + project = "squid" expected = "projects/{project}".format( project=project, ) @@ -9772,7 +9857,7 @@ def test_common_project_path(): def test_parse_common_project_path(): expected = { - "project": "octopus", + "project": "clam", } path = ParticipantsClient.common_project_path(**expected) @@ -9782,8 +9867,8 @@ def test_parse_common_project_path(): def test_common_location_path(): - project = "oyster" - location = "nudibranch" + project = "whelk" + location = "octopus" expected = "projects/{project}/locations/{location}".format( project=project, location=location, @@ -9794,8 +9879,8 @@ def test_common_location_path(): def test_parse_common_location_path(): expected = { - "project": "cuttlefish", - "location": "mussel", + "project": "oyster", + "location": "nudibranch", } path = ParticipantsClient.common_location_path(**expected) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_session_entity_types.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_session_entity_types.py index fd229ea7dfea..8a4fbdb670a3 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_session_entity_types.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_session_entity_types.py @@ -56,10 +56,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.session_entity_types import ( SessionEntityTypesAsyncClient, SessionEntityTypesClient, @@ -70,6 +66,9 @@ from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sessions.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sessions.py index b0a40a1c4e80..eeda93e5da97 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sessions.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sessions.py @@ -59,10 +59,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.sessions import ( SessionsAsyncClient, SessionsClient, @@ -76,6 +72,9 @@ session_entity_type, ) from google.cloud.dialogflow_v2.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 CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sip_trunks.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sip_trunks.py index 525c36ae2227..43a10d280a1f 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sip_trunks.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sip_trunks.py @@ -57,10 +57,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.sip_trunks import ( SipTrunksAsyncClient, SipTrunksClient, @@ -69,6 +65,9 @@ ) from google.cloud.dialogflow_v2.types import sip_trunk from google.cloud.dialogflow_v2.types import sip_trunk as gcd_sip_trunk +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_tools.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_tools.py index 4ebc2d3c9993..5f7eca6752d4 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_tools.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_tools.py @@ -58,10 +58,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.tools import ( ToolsAsyncClient, ToolsClient, @@ -70,6 +66,9 @@ ) from google.cloud.dialogflow_v2.types import tool from google.cloud.dialogflow_v2.types import tool as gcd_tool +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_versions.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_versions.py index c47c20c84a0e..83b13b6331c5 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_versions.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_versions.py @@ -57,10 +57,6 @@ from google.api_core import retry as retries 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.dialogflow_v2.services.versions import ( VersionsAsyncClient, VersionsClient, @@ -69,6 +65,9 @@ ) from google.cloud.dialogflow_v2.types import version from google.cloud.dialogflow_v2.types import version as gcd_version +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_agents.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_agents.py index 3d77be24d6eb..d8c2c10e84d1 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_agents.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_agents.py @@ -62,10 +62,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.agents import ( AgentsAsyncClient, AgentsClient, @@ -74,6 +70,9 @@ ) from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_answer_records.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_answer_records.py index 521093b9d3b0..8c844ac3ed86 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_answer_records.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_answer_records.py @@ -58,10 +58,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.answer_records import ( AnswerRecordsAsyncClient, AnswerRecordsClient, @@ -79,6 +75,9 @@ tool_call, ) from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -3815,6 +3814,9 @@ def test_update_answer_record_rest_call_success(request_type): { "tool_call": { "tool": "tool_value", + "ces_tool": "ces_tool_value", + "ces_toolset": "ces_toolset_value", + "ces_app": "ces_app_value", "tool_display_name": "tool_display_name_value", "tool_display_details": "tool_display_details_value", "action": "action_value", @@ -3825,6 +3827,9 @@ def test_update_answer_record_rest_call_success(request_type): }, "tool_call_result": { "tool": "tool_value", + "ces_tool": "ces_tool_value", + "ces_toolset": "ces_toolset_value", + "ces_app": "ces_app_value", "action": "action_value", "error": {"message": "message_value"}, "raw_content": b"raw_content_blob", @@ -4858,10 +4863,65 @@ def test_parse_answer_record_path(): assert expected == actual -def test_context_path(): +def test_app_path(): project = "oyster" - session = "nudibranch" - context = "cuttlefish" + location = "nudibranch" + app = "cuttlefish" + expected = "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + actual = AnswerRecordsClient.app_path(project, location, app) + assert expected == actual + + +def test_parse_app_path(): + expected = { + "project": "mussel", + "location": "winkle", + "app": "nautilus", + } + path = AnswerRecordsClient.app_path(**expected) + + # Check that the path construction is reversible. + actual = AnswerRecordsClient.parse_app_path(path) + assert expected == actual + + +def test_ces_tool_path(): + project = "scallop" + location = "abalone" + app = "squid" + tool = "clam" + expected = "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + actual = AnswerRecordsClient.ces_tool_path(project, location, app, tool) + assert expected == actual + + +def test_parse_ces_tool_path(): + expected = { + "project": "whelk", + "location": "octopus", + "app": "oyster", + "tool": "nudibranch", + } + path = AnswerRecordsClient.ces_tool_path(**expected) + + # Check that the path construction is reversible. + actual = AnswerRecordsClient.parse_ces_tool_path(path) + assert expected == actual + + +def test_context_path(): + project = "cuttlefish" + session = "mussel" + context = "winkle" expected = "projects/{project}/agent/sessions/{session}/contexts/{context}".format( project=project, session=session, @@ -4873,9 +4933,9 @@ def test_context_path(): def test_parse_context_path(): expected = { - "project": "mussel", - "session": "winkle", - "context": "nautilus", + "project": "nautilus", + "session": "scallop", + "context": "abalone", } path = AnswerRecordsClient.context_path(**expected) @@ -4885,9 +4945,9 @@ def test_parse_context_path(): def test_document_path(): - project = "scallop" - knowledge_base = "abalone" - document = "squid" + project = "squid" + knowledge_base = "clam" + document = "whelk" expected = "projects/{project}/knowledgeBases/{knowledge_base}/documents/{document}".format( project=project, knowledge_base=knowledge_base, @@ -4899,9 +4959,9 @@ def test_document_path(): def test_parse_document_path(): expected = { - "project": "clam", - "knowledge_base": "whelk", - "document": "octopus", + "project": "octopus", + "knowledge_base": "oyster", + "document": "nudibranch", } path = AnswerRecordsClient.document_path(**expected) @@ -4911,8 +4971,8 @@ def test_parse_document_path(): def test_intent_path(): - project = "oyster" - intent = "nudibranch" + project = "cuttlefish" + intent = "mussel" expected = "projects/{project}/agent/intents/{intent}".format( project=project, intent=intent, @@ -4923,8 +4983,8 @@ def test_intent_path(): def test_parse_intent_path(): expected = { - "project": "cuttlefish", - "intent": "mussel", + "project": "winkle", + "intent": "nautilus", } path = AnswerRecordsClient.intent_path(**expected) @@ -4934,9 +4994,9 @@ def test_parse_intent_path(): def test_tool_path(): - project = "winkle" - location = "nautilus" - tool = "scallop" + project = "scallop" + location = "abalone" + tool = "squid" expected = "projects/{project}/locations/{location}/tools/{tool}".format( project=project, location=location, @@ -4948,9 +5008,9 @@ def test_tool_path(): def test_parse_tool_path(): expected = { - "project": "abalone", - "location": "squid", - "tool": "clam", + "project": "clam", + "location": "whelk", + "tool": "octopus", } path = AnswerRecordsClient.tool_path(**expected) @@ -4959,8 +5019,39 @@ def test_parse_tool_path(): assert expected == actual +def test_toolset_path(): + project = "oyster" + location = "nudibranch" + app = "cuttlefish" + toolset = "mussel" + expected = ( + "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + ) + actual = AnswerRecordsClient.toolset_path(project, location, app, toolset) + assert expected == actual + + +def test_parse_toolset_path(): + expected = { + "project": "winkle", + "location": "nautilus", + "app": "scallop", + "toolset": "abalone", + } + path = AnswerRecordsClient.toolset_path(**expected) + + # Check that the path construction is reversible. + actual = AnswerRecordsClient.parse_toolset_path(path) + assert expected == actual + + def test_common_billing_account_path(): - billing_account = "whelk" + billing_account = "squid" expected = "billingAccounts/{billing_account}".format( billing_account=billing_account, ) @@ -4970,7 +5061,7 @@ def test_common_billing_account_path(): def test_parse_common_billing_account_path(): expected = { - "billing_account": "octopus", + "billing_account": "clam", } path = AnswerRecordsClient.common_billing_account_path(**expected) @@ -4980,7 +5071,7 @@ def test_parse_common_billing_account_path(): def test_common_folder_path(): - folder = "oyster" + folder = "whelk" expected = "folders/{folder}".format( folder=folder, ) @@ -4990,7 +5081,7 @@ def test_common_folder_path(): def test_parse_common_folder_path(): expected = { - "folder": "nudibranch", + "folder": "octopus", } path = AnswerRecordsClient.common_folder_path(**expected) @@ -5000,7 +5091,7 @@ def test_parse_common_folder_path(): def test_common_organization_path(): - organization = "cuttlefish" + organization = "oyster" expected = "organizations/{organization}".format( organization=organization, ) @@ -5010,7 +5101,7 @@ def test_common_organization_path(): def test_parse_common_organization_path(): expected = { - "organization": "mussel", + "organization": "nudibranch", } path = AnswerRecordsClient.common_organization_path(**expected) @@ -5020,7 +5111,7 @@ def test_parse_common_organization_path(): def test_common_project_path(): - project = "winkle" + project = "cuttlefish" expected = "projects/{project}".format( project=project, ) @@ -5030,7 +5121,7 @@ def test_common_project_path(): def test_parse_common_project_path(): expected = { - "project": "nautilus", + "project": "mussel", } path = AnswerRecordsClient.common_project_path(**expected) @@ -5040,8 +5131,8 @@ def test_parse_common_project_path(): def test_common_location_path(): - project = "scallop" - location = "abalone" + project = "winkle" + location = "nautilus" expected = "projects/{project}/locations/{location}".format( project=project, location=location, @@ -5052,8 +5143,8 @@ def test_common_location_path(): def test_parse_common_location_path(): expected = { - "project": "squid", - "location": "clam", + "project": "scallop", + "location": "abalone", } path = AnswerRecordsClient.common_location_path(**expected) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_contexts.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_contexts.py index 447e43a96fe6..454bd740c190 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_contexts.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_contexts.py @@ -57,10 +57,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.contexts import ( ContextsAsyncClient, ContextsClient, @@ -69,6 +65,9 @@ ) from google.cloud.dialogflow_v2beta1.types import context from google.cloud.dialogflow_v2beta1.types import context as gcd_context +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversation_profiles.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversation_profiles.py index 5ab875a76843..47230d4858d6 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversation_profiles.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversation_profiles.py @@ -62,10 +62,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.conversation_profiles import ( ConversationProfilesAsyncClient, ConversationProfilesClient, @@ -81,6 +77,9 @@ from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1971,6 +1970,7 @@ def test_get_conversation_profile(request_type, transport: str = "grpc"): call.return_value = conversation_profile.ConversationProfile( name="name_value", display_name="display_name_value", + use_bidi_streaming=True, language_code="language_code_value", time_zone="time_zone_value", security_settings="security_settings_value", @@ -1987,6 +1987,7 @@ def test_get_conversation_profile(request_type, transport: str = "grpc"): assert isinstance(response, conversation_profile.ConversationProfile) assert response.name == "name_value" assert response.display_name == "display_name_value" + assert response.use_bidi_streaming is True assert response.language_code == "language_code_value" assert response.time_zone == "time_zone_value" assert response.security_settings == "security_settings_value" @@ -2127,6 +2128,7 @@ async def test_get_conversation_profile_async( conversation_profile.ConversationProfile( name="name_value", display_name="display_name_value", + use_bidi_streaming=True, language_code="language_code_value", time_zone="time_zone_value", security_settings="security_settings_value", @@ -2144,6 +2146,7 @@ async def test_get_conversation_profile_async( assert isinstance(response, conversation_profile.ConversationProfile) assert response.name == "name_value" assert response.display_name == "display_name_value" + assert response.use_bidi_streaming is True assert response.language_code == "language_code_value" assert response.time_zone == "time_zone_value" assert response.security_settings == "security_settings_value" @@ -2330,6 +2333,7 @@ def test_create_conversation_profile(request_type, transport: str = "grpc"): call.return_value = gcd_conversation_profile.ConversationProfile( name="name_value", display_name="display_name_value", + use_bidi_streaming=True, language_code="language_code_value", time_zone="time_zone_value", security_settings="security_settings_value", @@ -2346,6 +2350,7 @@ def test_create_conversation_profile(request_type, transport: str = "grpc"): assert isinstance(response, gcd_conversation_profile.ConversationProfile) assert response.name == "name_value" assert response.display_name == "display_name_value" + assert response.use_bidi_streaming is True assert response.language_code == "language_code_value" assert response.time_zone == "time_zone_value" assert response.security_settings == "security_settings_value" @@ -2486,6 +2491,7 @@ async def test_create_conversation_profile_async( gcd_conversation_profile.ConversationProfile( name="name_value", display_name="display_name_value", + use_bidi_streaming=True, language_code="language_code_value", time_zone="time_zone_value", security_settings="security_settings_value", @@ -2503,6 +2509,7 @@ async def test_create_conversation_profile_async( assert isinstance(response, gcd_conversation_profile.ConversationProfile) assert response.name == "name_value" assert response.display_name == "display_name_value" + assert response.use_bidi_streaming is True assert response.language_code == "language_code_value" assert response.time_zone == "time_zone_value" assert response.security_settings == "security_settings_value" @@ -2707,6 +2714,7 @@ def test_update_conversation_profile(request_type, transport: str = "grpc"): call.return_value = gcd_conversation_profile.ConversationProfile( name="name_value", display_name="display_name_value", + use_bidi_streaming=True, language_code="language_code_value", time_zone="time_zone_value", security_settings="security_settings_value", @@ -2723,6 +2731,7 @@ def test_update_conversation_profile(request_type, transport: str = "grpc"): assert isinstance(response, gcd_conversation_profile.ConversationProfile) assert response.name == "name_value" assert response.display_name == "display_name_value" + assert response.use_bidi_streaming is True assert response.language_code == "language_code_value" assert response.time_zone == "time_zone_value" assert response.security_settings == "security_settings_value" @@ -2859,6 +2868,7 @@ async def test_update_conversation_profile_async( gcd_conversation_profile.ConversationProfile( name="name_value", display_name="display_name_value", + use_bidi_streaming=True, language_code="language_code_value", time_zone="time_zone_value", security_settings="security_settings_value", @@ -2876,6 +2886,7 @@ async def test_update_conversation_profile_async( assert isinstance(response, gcd_conversation_profile.ConversationProfile) assert response.name == "name_value" assert response.display_name == "display_name_value" + assert response.use_bidi_streaming is True assert response.language_code == "language_code_value" assert response.time_zone == "time_zone_value" assert response.security_settings == "security_settings_value" @@ -5910,6 +5921,7 @@ async def test_get_conversation_profile_empty_call_grpc_asyncio(): conversation_profile.ConversationProfile( name="name_value", display_name="display_name_value", + use_bidi_streaming=True, language_code="language_code_value", time_zone="time_zone_value", security_settings="security_settings_value", @@ -5943,6 +5955,7 @@ async def test_create_conversation_profile_empty_call_grpc_asyncio(): gcd_conversation_profile.ConversationProfile( name="name_value", display_name="display_name_value", + use_bidi_streaming=True, language_code="language_code_value", time_zone="time_zone_value", security_settings="security_settings_value", @@ -5976,6 +5989,7 @@ async def test_update_conversation_profile_empty_call_grpc_asyncio(): gcd_conversation_profile.ConversationProfile( name="name_value", display_name="display_name_value", + use_bidi_streaming=True, language_code="language_code_value", time_zone="time_zone_value", security_settings="security_settings_value", @@ -6265,6 +6279,7 @@ def test_get_conversation_profile_rest_call_success(request_type): return_value = conversation_profile.ConversationProfile( name="name_value", display_name="display_name_value", + use_bidi_streaming=True, language_code="language_code_value", time_zone="time_zone_value", security_settings="security_settings_value", @@ -6286,6 +6301,7 @@ def test_get_conversation_profile_rest_call_success(request_type): assert isinstance(response, conversation_profile.ConversationProfile) assert response.name == "name_value" assert response.display_name == "display_name_value" + assert response.use_bidi_streaming is True assert response.language_code == "language_code_value" assert response.time_zone == "time_zone_value" assert response.security_settings == "security_settings_value" @@ -6408,6 +6424,7 @@ def test_create_conversation_profile_rest_call_success(request_type): "display_name": "display_name_value", "create_time": {"seconds": 751, "nanos": 543}, "update_time": {}, + "use_bidi_streaming": True, "automated_agent_config": { "agent": "agent_value", "session_ttl": {"seconds": 751, "nanos": 543}, @@ -6475,6 +6492,7 @@ def test_create_conversation_profile_rest_call_success(request_type): "message_analysis_config": { "enable_entity_extraction": True, "enable_sentiment_analysis": True, + "enable_sentiment_analysis_v3": True, }, }, "human_agent_handoff_config": { @@ -6600,6 +6618,7 @@ def get_message_fields(field): return_value = gcd_conversation_profile.ConversationProfile( name="name_value", display_name="display_name_value", + use_bidi_streaming=True, language_code="language_code_value", time_zone="time_zone_value", security_settings="security_settings_value", @@ -6621,6 +6640,7 @@ def get_message_fields(field): assert isinstance(response, gcd_conversation_profile.ConversationProfile) assert response.name == "name_value" assert response.display_name == "display_name_value" + assert response.use_bidi_streaming is True assert response.language_code == "language_code_value" assert response.time_zone == "time_zone_value" assert response.security_settings == "security_settings_value" @@ -6751,6 +6771,7 @@ def test_update_conversation_profile_rest_call_success(request_type): "display_name": "display_name_value", "create_time": {"seconds": 751, "nanos": 543}, "update_time": {}, + "use_bidi_streaming": True, "automated_agent_config": { "agent": "agent_value", "session_ttl": {"seconds": 751, "nanos": 543}, @@ -6818,6 +6839,7 @@ def test_update_conversation_profile_rest_call_success(request_type): "message_analysis_config": { "enable_entity_extraction": True, "enable_sentiment_analysis": True, + "enable_sentiment_analysis_v3": True, }, }, "human_agent_handoff_config": { @@ -6943,6 +6965,7 @@ def get_message_fields(field): return_value = gcd_conversation_profile.ConversationProfile( name="name_value", display_name="display_name_value", + use_bidi_streaming=True, language_code="language_code_value", time_zone="time_zone_value", security_settings="security_settings_value", @@ -6964,6 +6987,7 @@ def get_message_fields(field): assert isinstance(response, gcd_conversation_profile.ConversationProfile) assert response.name == "name_value" assert response.display_name == "display_name_value" + assert response.use_bidi_streaming is True assert response.language_code == "language_code_value" assert response.time_zone == "time_zone_value" assert response.security_settings == "security_settings_value" diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversations.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversations.py index bdaf51c03f25..15b8c48c0cc4 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversations.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversations.py @@ -58,10 +58,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.conversations import ( ConversationsAsyncClient, ConversationsClient, @@ -71,14 +67,21 @@ from google.cloud.dialogflow_v2beta1.types import ( agent_coaching_instruction, audio_config, + ces_app, + ces_tool, conversation, conversation_profile, generator, participant, session, + tool, tool_call, + toolset, ) from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -8742,7 +8745,133 @@ def test_create_conversation_rest_call_success(request_type): {"mime_type": "mime_type_value", "content": b"content_blob"} ], }, + "initial_conversation_profile": { + "name": "name_value", + "display_name": "display_name_value", + "create_time": {}, + "update_time": {}, + "use_bidi_streaming": True, + "automated_agent_config": { + "agent": "agent_value", + "session_ttl": {"seconds": 751, "nanos": 543}, + }, + "human_agent_assistant_config": { + "notification_config": {"topic": "topic_value", "message_format": 1}, + "human_agent_suggestion_config": { + "feature_configs": [ + { + "suggestion_feature": {"type_": 1}, + "enable_event_based_suggestion": True, + "disable_agent_query_logging": True, + "enable_query_suggestion_when_no_answer": True, + "enable_conversation_augmented_query": True, + "enable_query_suggestion_only": True, + "enable_response_debug_info": True, + "rai_settings": { + "rai_category_configs": [ + {"category": 1, "sensitivity_level": 1} + ] + }, + "suggestion_trigger_settings": { + "no_small_talk": True, + "only_end_user": True, + }, + "query_config": { + "knowledge_base_query_source": { + "knowledge_bases": [ + "knowledge_bases_value1", + "knowledge_bases_value2", + ] + }, + "document_query_source": { + "documents": [ + "documents_value1", + "documents_value2", + ] + }, + "dialogflow_query_source": { + "agent": "agent_value", + "human_agent_side_config": {"agent": "agent_value"}, + }, + "max_results": 1207, + "confidence_threshold": 0.2106, + "context_filter_settings": { + "drop_handoff_messages": True, + "drop_virtual_agent_messages": True, + "drop_ivr_messages": True, + }, + "sections": {"section_types": [1]}, + "context_size": 1311, + }, + "conversation_model_config": { + "model": "model_value", + "baseline_model_version": "baseline_model_version_value", + }, + "conversation_process_config": { + "recent_sentences_count": 2352 + }, + } + ], + "group_suggestion_responses": True, + "generators": ["generators_value1", "generators_value2"], + "disable_high_latency_features_sync_delivery": True, + "skip_empty_event_based_suggestion": True, + "use_unredacted_conversation_data": True, + "enable_async_tool_call": True, + }, + "end_user_suggestion_config": {}, + "message_analysis_config": { + "enable_entity_extraction": True, + "enable_sentiment_analysis": True, + "enable_sentiment_analysis_v3": True, + }, + }, + "human_agent_handoff_config": { + "live_person_config": {"account_number": "account_number_value"}, + "salesforce_live_agent_config": { + "organization_id": "organization_id_value", + "deployment_id": "deployment_id_value", + "button_id": "button_id_value", + "endpoint_domain": "endpoint_domain_value", + }, + }, + "notification_config": {}, + "logging_config": {"enable_stackdriver_logging": True}, + "new_message_event_notification_config": {}, + "new_recognition_result_notification_config": {}, + "stt_config": { + "speech_model_variant": 1, + "model": "model_value", + "phrase_sets": ["phrase_sets_value1", "phrase_sets_value2"], + "audio_encoding": 1, + "sample_rate_hertz": 1817, + "language_code": "language_code_value", + "enable_word_info": True, + "use_timeout_based_endpointing": True, + }, + "language_code": "language_code_value", + "time_zone": "time_zone_value", + "security_settings": "security_settings_value", + "tts_config": { + "speaking_rate": 0.1373, + "pitch": 0.536, + "volume_gain_db": 0.1467, + "effects_profile_id": [ + "effects_profile_id_value1", + "effects_profile_id_value2", + ], + "voice": {"name": "name_value", "ssml_gender": 1}, + "pronunciations": [ + { + "phrase": "phrase_value", + "phonetic_encoding": 1, + "pronunciation": "pronunciation_value", + } + ], + }, + }, "ingested_context_references": {}, + "initial_generator_contexts": {}, } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency @@ -11527,9 +11656,64 @@ def test_parse_answer_record_path(): assert expected == actual -def test_conversation_path(): +def test_app_path(): project = "cuttlefish" - conversation = "mussel" + location = "mussel" + app = "winkle" + expected = "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + actual = ConversationsClient.app_path(project, location, app) + assert expected == actual + + +def test_parse_app_path(): + expected = { + "project": "nautilus", + "location": "scallop", + "app": "abalone", + } + path = ConversationsClient.app_path(**expected) + + # Check that the path construction is reversible. + actual = ConversationsClient.parse_app_path(path) + assert expected == actual + + +def test_ces_tool_path(): + project = "squid" + location = "clam" + app = "whelk" + tool = "octopus" + expected = "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + actual = ConversationsClient.ces_tool_path(project, location, app, tool) + assert expected == actual + + +def test_parse_ces_tool_path(): + expected = { + "project": "oyster", + "location": "nudibranch", + "app": "cuttlefish", + "tool": "mussel", + } + path = ConversationsClient.ces_tool_path(**expected) + + # Check that the path construction is reversible. + actual = ConversationsClient.parse_ces_tool_path(path) + assert expected == actual + + +def test_conversation_path(): + project = "winkle" + conversation = "nautilus" expected = "projects/{project}/conversations/{conversation}".format( project=project, conversation=conversation, @@ -11540,8 +11724,8 @@ def test_conversation_path(): def test_parse_conversation_path(): expected = { - "project": "winkle", - "conversation": "nautilus", + "project": "scallop", + "conversation": "abalone", } path = ConversationsClient.conversation_path(**expected) @@ -11551,9 +11735,9 @@ def test_parse_conversation_path(): def test_conversation_model_path(): - project = "scallop" - location = "abalone" - conversation_model = "squid" + project = "squid" + location = "clam" + conversation_model = "whelk" expected = "projects/{project}/locations/{location}/conversationModels/{conversation_model}".format( project=project, location=location, @@ -11567,9 +11751,9 @@ def test_conversation_model_path(): def test_parse_conversation_model_path(): expected = { - "project": "clam", - "location": "whelk", - "conversation_model": "octopus", + "project": "octopus", + "location": "oyster", + "conversation_model": "nudibranch", } path = ConversationsClient.conversation_model_path(**expected) @@ -11579,8 +11763,8 @@ def test_parse_conversation_model_path(): def test_conversation_profile_path(): - project = "oyster" - conversation_profile = "nudibranch" + project = "cuttlefish" + conversation_profile = "mussel" expected = "projects/{project}/conversationProfiles/{conversation_profile}".format( project=project, conversation_profile=conversation_profile, @@ -11593,8 +11777,8 @@ def test_conversation_profile_path(): def test_parse_conversation_profile_path(): expected = { - "project": "cuttlefish", - "conversation_profile": "mussel", + "project": "winkle", + "conversation_profile": "nautilus", } path = ConversationsClient.conversation_profile_path(**expected) @@ -11604,9 +11788,9 @@ def test_parse_conversation_profile_path(): def test_cx_security_settings_path(): - project = "winkle" - location = "nautilus" - security_settings = "scallop" + project = "scallop" + location = "abalone" + security_settings = "squid" expected = "projects/{project}/locations/{location}/securitySettings/{security_settings}".format( project=project, location=location, @@ -11620,9 +11804,9 @@ def test_cx_security_settings_path(): def test_parse_cx_security_settings_path(): expected = { - "project": "abalone", - "location": "squid", - "security_settings": "clam", + "project": "clam", + "location": "whelk", + "security_settings": "octopus", } path = ConversationsClient.cx_security_settings_path(**expected) @@ -11632,10 +11816,10 @@ def test_parse_cx_security_settings_path(): def test_data_store_path(): - project = "whelk" - location = "octopus" - collection = "oyster" - data_store = "nudibranch" + project = "oyster" + location = "nudibranch" + collection = "cuttlefish" + data_store = "mussel" expected = "projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store}".format( project=project, location=location, @@ -11650,10 +11834,10 @@ def test_data_store_path(): def test_parse_data_store_path(): expected = { - "project": "cuttlefish", - "location": "mussel", - "collection": "winkle", - "data_store": "nautilus", + "project": "winkle", + "location": "nautilus", + "collection": "scallop", + "data_store": "abalone", } path = ConversationsClient.data_store_path(**expected) @@ -11663,9 +11847,9 @@ def test_parse_data_store_path(): def test_document_path(): - project = "scallop" - knowledge_base = "abalone" - document = "squid" + project = "squid" + knowledge_base = "clam" + document = "whelk" expected = "projects/{project}/knowledgeBases/{knowledge_base}/documents/{document}".format( project=project, knowledge_base=knowledge_base, @@ -11677,9 +11861,9 @@ def test_document_path(): def test_parse_document_path(): expected = { - "project": "clam", - "knowledge_base": "whelk", - "document": "octopus", + "project": "octopus", + "knowledge_base": "oyster", + "document": "nudibranch", } path = ConversationsClient.document_path(**expected) @@ -11689,9 +11873,9 @@ def test_parse_document_path(): def test_generator_path(): - project = "oyster" - location = "nudibranch" - generator = "cuttlefish" + project = "cuttlefish" + location = "mussel" + generator = "winkle" expected = "projects/{project}/locations/{location}/generators/{generator}".format( project=project, location=location, @@ -11703,9 +11887,9 @@ def test_generator_path(): def test_parse_generator_path(): expected = { - "project": "mussel", - "location": "winkle", - "generator": "nautilus", + "project": "nautilus", + "location": "scallop", + "generator": "abalone", } path = ConversationsClient.generator_path(**expected) @@ -11715,8 +11899,8 @@ def test_parse_generator_path(): def test_knowledge_base_path(): - project = "scallop" - knowledge_base = "abalone" + project = "squid" + knowledge_base = "clam" expected = "projects/{project}/knowledgeBases/{knowledge_base}".format( project=project, knowledge_base=knowledge_base, @@ -11727,8 +11911,8 @@ def test_knowledge_base_path(): def test_parse_knowledge_base_path(): expected = { - "project": "squid", - "knowledge_base": "clam", + "project": "whelk", + "knowledge_base": "octopus", } path = ConversationsClient.knowledge_base_path(**expected) @@ -11738,9 +11922,9 @@ def test_parse_knowledge_base_path(): def test_message_path(): - project = "whelk" - conversation = "octopus" - message = "oyster" + project = "oyster" + conversation = "nudibranch" + message = "cuttlefish" expected = ( "projects/{project}/conversations/{conversation}/messages/{message}".format( project=project, @@ -11754,9 +11938,9 @@ def test_message_path(): def test_parse_message_path(): expected = { - "project": "nudibranch", - "conversation": "cuttlefish", - "message": "mussel", + "project": "mussel", + "conversation": "winkle", + "message": "nautilus", } path = ConversationsClient.message_path(**expected) @@ -11766,9 +11950,9 @@ def test_parse_message_path(): def test_phrase_set_path(): - project = "winkle" - location = "nautilus" - phrase_set = "scallop" + project = "scallop" + location = "abalone" + phrase_set = "squid" expected = "projects/{project}/locations/{location}/phraseSets/{phrase_set}".format( project=project, location=location, @@ -11780,9 +11964,9 @@ def test_phrase_set_path(): def test_parse_phrase_set_path(): expected = { - "project": "abalone", - "location": "squid", - "phrase_set": "clam", + "project": "clam", + "location": "whelk", + "phrase_set": "octopus", } path = ConversationsClient.phrase_set_path(**expected) @@ -11792,9 +11976,9 @@ def test_parse_phrase_set_path(): def test_tool_path(): - project = "whelk" - location = "octopus" - tool = "oyster" + project = "oyster" + location = "nudibranch" + tool = "cuttlefish" expected = "projects/{project}/locations/{location}/tools/{tool}".format( project=project, location=location, @@ -11806,9 +11990,9 @@ def test_tool_path(): def test_parse_tool_path(): expected = { - "project": "nudibranch", - "location": "cuttlefish", - "tool": "mussel", + "project": "mussel", + "location": "winkle", + "tool": "nautilus", } path = ConversationsClient.tool_path(**expected) @@ -11817,8 +12001,39 @@ def test_parse_tool_path(): assert expected == actual +def test_toolset_path(): + project = "scallop" + location = "abalone" + app = "squid" + toolset = "clam" + expected = ( + "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + ) + actual = ConversationsClient.toolset_path(project, location, app, toolset) + assert expected == actual + + +def test_parse_toolset_path(): + expected = { + "project": "whelk", + "location": "octopus", + "app": "oyster", + "toolset": "nudibranch", + } + path = ConversationsClient.toolset_path(**expected) + + # Check that the path construction is reversible. + actual = ConversationsClient.parse_toolset_path(path) + assert expected == actual + + def test_common_billing_account_path(): - billing_account = "winkle" + billing_account = "cuttlefish" expected = "billingAccounts/{billing_account}".format( billing_account=billing_account, ) @@ -11828,7 +12043,7 @@ def test_common_billing_account_path(): def test_parse_common_billing_account_path(): expected = { - "billing_account": "nautilus", + "billing_account": "mussel", } path = ConversationsClient.common_billing_account_path(**expected) @@ -11838,7 +12053,7 @@ def test_parse_common_billing_account_path(): def test_common_folder_path(): - folder = "scallop" + folder = "winkle" expected = "folders/{folder}".format( folder=folder, ) @@ -11848,7 +12063,7 @@ def test_common_folder_path(): def test_parse_common_folder_path(): expected = { - "folder": "abalone", + "folder": "nautilus", } path = ConversationsClient.common_folder_path(**expected) @@ -11858,7 +12073,7 @@ def test_parse_common_folder_path(): def test_common_organization_path(): - organization = "squid" + organization = "scallop" expected = "organizations/{organization}".format( organization=organization, ) @@ -11868,7 +12083,7 @@ def test_common_organization_path(): def test_parse_common_organization_path(): expected = { - "organization": "clam", + "organization": "abalone", } path = ConversationsClient.common_organization_path(**expected) @@ -11878,7 +12093,7 @@ def test_parse_common_organization_path(): def test_common_project_path(): - project = "whelk" + project = "squid" expected = "projects/{project}".format( project=project, ) @@ -11888,7 +12103,7 @@ def test_common_project_path(): def test_parse_common_project_path(): expected = { - "project": "octopus", + "project": "clam", } path = ConversationsClient.common_project_path(**expected) @@ -11898,8 +12113,8 @@ def test_parse_common_project_path(): def test_common_location_path(): - project = "oyster" - location = "nudibranch" + project = "whelk" + location = "octopus" expected = "projects/{project}/locations/{location}".format( project=project, location=location, @@ -11910,8 +12125,8 @@ def test_common_location_path(): def test_parse_common_location_path(): expected = { - "project": "cuttlefish", - "location": "mussel", + "project": "oyster", + "location": "nudibranch", } path = ConversationsClient.common_location_path(**expected) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_documents.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_documents.py index 87aedc55e725..8c6069b8bcc5 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_documents.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_documents.py @@ -64,10 +64,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.documents import ( DocumentsAsyncClient, DocumentsClient, @@ -76,6 +72,9 @@ ) from google.cloud.dialogflow_v2beta1.types import document, gcs from google.cloud.dialogflow_v2beta1.types import document as gcd_document +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_encryption_spec_service.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_encryption_spec_service.py index d86f148f5aed..4982973eb6f9 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_encryption_spec_service.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_encryption_spec_service.py @@ -59,10 +59,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.encryption_spec_service import ( EncryptionSpecServiceAsyncClient, EncryptionSpecServiceClient, @@ -70,6 +66,9 @@ ) from google.cloud.dialogflow_v2beta1.types import encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_entity_types.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_entity_types.py index 443e9ab927ea..88b1be9dbfe1 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_entity_types.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_entity_types.py @@ -62,10 +62,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.entity_types import ( EntityTypesAsyncClient, EntityTypesClient, @@ -74,6 +70,9 @@ ) from google.cloud.dialogflow_v2beta1.types import entity_type from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_environments.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_environments.py index 7013c7a23dc5..fabc4bf3f57b 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_environments.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_environments.py @@ -57,10 +57,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.environments import ( EnvironmentsAsyncClient, EnvironmentsClient, @@ -68,6 +64,9 @@ transports, ) from google.cloud.dialogflow_v2beta1.types import audio_config, environment, fulfillment +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_fulfillments.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_fulfillments.py index f0233c67686d..c07bca915ad2 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_fulfillments.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_fulfillments.py @@ -56,10 +56,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.fulfillments import ( FulfillmentsAsyncClient, FulfillmentsClient, @@ -67,6 +63,9 @@ ) from google.cloud.dialogflow_v2beta1.types import fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generator_evaluations.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generator_evaluations.py index b9aa48361e8b..d1848d6d5370 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generator_evaluations.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generator_evaluations.py @@ -63,10 +63,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.generator_evaluations import ( GeneratorEvaluationsAsyncClient, GeneratorEvaluationsClient, @@ -75,14 +71,21 @@ ) from google.cloud.dialogflow_v2beta1.types import ( agent_coaching_instruction, + ces_app, + ces_tool, generator, generator_evaluation, operations, + tool, tool_call, + toolset, ) from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -4320,6 +4323,9 @@ def test_create_generator_evaluation_rest_call_success(request_type): { "tool_call": { "tool": "tool_value", + "ces_tool": "ces_tool_value", + "ces_toolset": "ces_toolset_value", + "ces_app": "ces_app_value", "tool_display_name": "tool_display_name_value", "tool_display_details": "tool_display_details_value", "action": "action_value", @@ -4330,6 +4336,9 @@ def test_create_generator_evaluation_rest_call_success(request_type): }, "tool_call_result": { "tool": "tool_value", + "ces_tool": "ces_tool_value", + "ces_toolset": "ces_toolset_value", + "ces_app": "ces_app_value", "action": "action_value", "error": {"message": "message_value"}, "raw_content": b"raw_content_blob", @@ -4360,6 +4369,19 @@ def test_create_generator_evaluation_rest_call_success(request_type): "enable_deduping": True, "similarity_threshold": 0.21630000000000002, }, + "toolset_tools": [ + { + "toolset": "toolset_value", + "operation_id": "operation_id_value", + "confirmation_requirement": 1, + } + ], + "ces_tool_specs": [ + {"ces_tool": "ces_tool_value", "confirmation_requirement": 1} + ], + "ces_app_specs": [ + {"ces_app": "ces_app_value", "confirmation_requirement": 1} + ], }, "summarization_metrics": { "summarization_evaluation_results": [ @@ -5926,10 +5948,65 @@ def test_generator_evaluations_grpc_lro_async_client(): assert transport.operations_client is transport.operations_client -def test_generator_path(): +def test_app_path(): project = "squid" location = "clam" - generator = "whelk" + app = "whelk" + expected = "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + actual = GeneratorEvaluationsClient.app_path(project, location, app) + assert expected == actual + + +def test_parse_app_path(): + expected = { + "project": "octopus", + "location": "oyster", + "app": "nudibranch", + } + path = GeneratorEvaluationsClient.app_path(**expected) + + # Check that the path construction is reversible. + actual = GeneratorEvaluationsClient.parse_app_path(path) + assert expected == actual + + +def test_ces_tool_path(): + project = "cuttlefish" + location = "mussel" + app = "winkle" + tool = "nautilus" + expected = "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + actual = GeneratorEvaluationsClient.ces_tool_path(project, location, app, tool) + assert expected == actual + + +def test_parse_ces_tool_path(): + expected = { + "project": "scallop", + "location": "abalone", + "app": "squid", + "tool": "clam", + } + path = GeneratorEvaluationsClient.ces_tool_path(**expected) + + # Check that the path construction is reversible. + actual = GeneratorEvaluationsClient.parse_ces_tool_path(path) + assert expected == actual + + +def test_generator_path(): + project = "whelk" + location = "octopus" + generator = "oyster" expected = "projects/{project}/locations/{location}/generators/{generator}".format( project=project, location=location, @@ -5941,9 +6018,9 @@ def test_generator_path(): def test_parse_generator_path(): expected = { - "project": "octopus", - "location": "oyster", - "generator": "nudibranch", + "project": "nudibranch", + "location": "cuttlefish", + "generator": "mussel", } path = GeneratorEvaluationsClient.generator_path(**expected) @@ -5953,10 +6030,10 @@ def test_parse_generator_path(): def test_generator_evaluation_path(): - project = "cuttlefish" - location = "mussel" - generator = "winkle" - evaluation = "nautilus" + project = "winkle" + location = "nautilus" + generator = "scallop" + evaluation = "abalone" expected = "projects/{project}/locations/{location}/generators/{generator}/evaluations/{evaluation}".format( project=project, location=location, @@ -5971,10 +6048,10 @@ def test_generator_evaluation_path(): def test_parse_generator_evaluation_path(): expected = { - "project": "scallop", - "location": "abalone", - "generator": "squid", - "evaluation": "clam", + "project": "squid", + "location": "clam", + "generator": "whelk", + "evaluation": "octopus", } path = GeneratorEvaluationsClient.generator_evaluation_path(**expected) @@ -5984,9 +6061,9 @@ def test_parse_generator_evaluation_path(): def test_tool_path(): - project = "whelk" - location = "octopus" - tool = "oyster" + project = "oyster" + location = "nudibranch" + tool = "cuttlefish" expected = "projects/{project}/locations/{location}/tools/{tool}".format( project=project, location=location, @@ -5998,9 +6075,9 @@ def test_tool_path(): def test_parse_tool_path(): expected = { - "project": "nudibranch", - "location": "cuttlefish", - "tool": "mussel", + "project": "mussel", + "location": "winkle", + "tool": "nautilus", } path = GeneratorEvaluationsClient.tool_path(**expected) @@ -6009,8 +6086,39 @@ def test_parse_tool_path(): assert expected == actual +def test_toolset_path(): + project = "scallop" + location = "abalone" + app = "squid" + toolset = "clam" + expected = ( + "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + ) + actual = GeneratorEvaluationsClient.toolset_path(project, location, app, toolset) + assert expected == actual + + +def test_parse_toolset_path(): + expected = { + "project": "whelk", + "location": "octopus", + "app": "oyster", + "toolset": "nudibranch", + } + path = GeneratorEvaluationsClient.toolset_path(**expected) + + # Check that the path construction is reversible. + actual = GeneratorEvaluationsClient.parse_toolset_path(path) + assert expected == actual + + def test_common_billing_account_path(): - billing_account = "winkle" + billing_account = "cuttlefish" expected = "billingAccounts/{billing_account}".format( billing_account=billing_account, ) @@ -6020,7 +6128,7 @@ def test_common_billing_account_path(): def test_parse_common_billing_account_path(): expected = { - "billing_account": "nautilus", + "billing_account": "mussel", } path = GeneratorEvaluationsClient.common_billing_account_path(**expected) @@ -6030,7 +6138,7 @@ def test_parse_common_billing_account_path(): def test_common_folder_path(): - folder = "scallop" + folder = "winkle" expected = "folders/{folder}".format( folder=folder, ) @@ -6040,7 +6148,7 @@ def test_common_folder_path(): def test_parse_common_folder_path(): expected = { - "folder": "abalone", + "folder": "nautilus", } path = GeneratorEvaluationsClient.common_folder_path(**expected) @@ -6050,7 +6158,7 @@ def test_parse_common_folder_path(): def test_common_organization_path(): - organization = "squid" + organization = "scallop" expected = "organizations/{organization}".format( organization=organization, ) @@ -6060,7 +6168,7 @@ def test_common_organization_path(): def test_parse_common_organization_path(): expected = { - "organization": "clam", + "organization": "abalone", } path = GeneratorEvaluationsClient.common_organization_path(**expected) @@ -6070,7 +6178,7 @@ def test_parse_common_organization_path(): def test_common_project_path(): - project = "whelk" + project = "squid" expected = "projects/{project}".format( project=project, ) @@ -6080,7 +6188,7 @@ def test_common_project_path(): def test_parse_common_project_path(): expected = { - "project": "octopus", + "project": "clam", } path = GeneratorEvaluationsClient.common_project_path(**expected) @@ -6090,8 +6198,8 @@ def test_parse_common_project_path(): def test_common_location_path(): - project = "oyster" - location = "nudibranch" + project = "whelk" + location = "octopus" expected = "projects/{project}/locations/{location}".format( project=project, location=location, @@ -6102,8 +6210,8 @@ def test_common_location_path(): def test_parse_common_location_path(): expected = { - "project": "cuttlefish", - "location": "mussel", + "project": "oyster", + "location": "nudibranch", } path = GeneratorEvaluationsClient.common_location_path(**expected) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generators.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generators.py index 9ae10e043497..fcd16e889518 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generators.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generators.py @@ -58,10 +58,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.generators import ( GeneratorsAsyncClient, GeneratorsClient, @@ -70,10 +66,17 @@ ) from google.cloud.dialogflow_v2beta1.types import ( agent_coaching_instruction, + ces_app, + ces_tool, generator, + tool, tool_call, + toolset, ) from google.cloud.dialogflow_v2beta1.types import generator as gcd_generator +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -4635,6 +4638,9 @@ def test_create_generator_rest_call_success(request_type): { "tool_call": { "tool": "tool_value", + "ces_tool": "ces_tool_value", + "ces_toolset": "ces_toolset_value", + "ces_app": "ces_app_value", "tool_display_name": "tool_display_name_value", "tool_display_details": "tool_display_details_value", "action": "action_value", @@ -4645,6 +4651,9 @@ def test_create_generator_rest_call_success(request_type): }, "tool_call_result": { "tool": "tool_value", + "ces_tool": "ces_tool_value", + "ces_toolset": "ces_toolset_value", + "ces_app": "ces_app_value", "action": "action_value", "error": {"message": "message_value"}, "raw_content": b"raw_content_blob", @@ -4675,6 +4684,17 @@ def test_create_generator_rest_call_success(request_type): "enable_deduping": True, "similarity_threshold": 0.21630000000000002, }, + "toolset_tools": [ + { + "toolset": "toolset_value", + "operation_id": "operation_id_value", + "confirmation_requirement": 1, + } + ], + "ces_tool_specs": [ + {"ces_tool": "ces_tool_value", "confirmation_requirement": 1} + ], + "ces_app_specs": [{"ces_app": "ces_app_value", "confirmation_requirement": 1}], } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency @@ -5340,6 +5360,9 @@ def test_update_generator_rest_call_success(request_type): { "tool_call": { "tool": "tool_value", + "ces_tool": "ces_tool_value", + "ces_toolset": "ces_toolset_value", + "ces_app": "ces_app_value", "tool_display_name": "tool_display_name_value", "tool_display_details": "tool_display_details_value", "action": "action_value", @@ -5350,6 +5373,9 @@ def test_update_generator_rest_call_success(request_type): }, "tool_call_result": { "tool": "tool_value", + "ces_tool": "ces_tool_value", + "ces_toolset": "ces_toolset_value", + "ces_app": "ces_app_value", "action": "action_value", "error": {"message": "message_value"}, "raw_content": b"raw_content_blob", @@ -5380,6 +5406,17 @@ def test_update_generator_rest_call_success(request_type): "enable_deduping": True, "similarity_threshold": 0.21630000000000002, }, + "toolset_tools": [ + { + "toolset": "toolset_value", + "operation_id": "operation_id_value", + "confirmation_requirement": 1, + } + ], + "ces_tool_specs": [ + {"ces_tool": "ces_tool_value", "confirmation_requirement": 1} + ], + "ces_app_specs": [{"ces_app": "ces_app_value", "confirmation_requirement": 1}], } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency @@ -6414,10 +6451,65 @@ def test_generators_transport_channel_mtls_with_adc(transport_class): assert transport.grpc_channel == mock_grpc_channel -def test_generator_path(): +def test_app_path(): project = "squid" location = "clam" - generator = "whelk" + app = "whelk" + expected = "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + actual = GeneratorsClient.app_path(project, location, app) + assert expected == actual + + +def test_parse_app_path(): + expected = { + "project": "octopus", + "location": "oyster", + "app": "nudibranch", + } + path = GeneratorsClient.app_path(**expected) + + # Check that the path construction is reversible. + actual = GeneratorsClient.parse_app_path(path) + assert expected == actual + + +def test_ces_tool_path(): + project = "cuttlefish" + location = "mussel" + app = "winkle" + tool = "nautilus" + expected = "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + actual = GeneratorsClient.ces_tool_path(project, location, app, tool) + assert expected == actual + + +def test_parse_ces_tool_path(): + expected = { + "project": "scallop", + "location": "abalone", + "app": "squid", + "tool": "clam", + } + path = GeneratorsClient.ces_tool_path(**expected) + + # Check that the path construction is reversible. + actual = GeneratorsClient.parse_ces_tool_path(path) + assert expected == actual + + +def test_generator_path(): + project = "whelk" + location = "octopus" + generator = "oyster" expected = "projects/{project}/locations/{location}/generators/{generator}".format( project=project, location=location, @@ -6429,9 +6521,9 @@ def test_generator_path(): def test_parse_generator_path(): expected = { - "project": "octopus", - "location": "oyster", - "generator": "nudibranch", + "project": "nudibranch", + "location": "cuttlefish", + "generator": "mussel", } path = GeneratorsClient.generator_path(**expected) @@ -6441,9 +6533,9 @@ def test_parse_generator_path(): def test_tool_path(): - project = "cuttlefish" - location = "mussel" - tool = "winkle" + project = "winkle" + location = "nautilus" + tool = "scallop" expected = "projects/{project}/locations/{location}/tools/{tool}".format( project=project, location=location, @@ -6455,9 +6547,9 @@ def test_tool_path(): def test_parse_tool_path(): expected = { - "project": "nautilus", - "location": "scallop", - "tool": "abalone", + "project": "abalone", + "location": "squid", + "tool": "clam", } path = GeneratorsClient.tool_path(**expected) @@ -6466,8 +6558,39 @@ def test_parse_tool_path(): assert expected == actual +def test_toolset_path(): + project = "whelk" + location = "octopus" + app = "oyster" + toolset = "nudibranch" + expected = ( + "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + ) + actual = GeneratorsClient.toolset_path(project, location, app, toolset) + assert expected == actual + + +def test_parse_toolset_path(): + expected = { + "project": "cuttlefish", + "location": "mussel", + "app": "winkle", + "toolset": "nautilus", + } + path = GeneratorsClient.toolset_path(**expected) + + # Check that the path construction is reversible. + actual = GeneratorsClient.parse_toolset_path(path) + assert expected == actual + + def test_common_billing_account_path(): - billing_account = "squid" + billing_account = "scallop" expected = "billingAccounts/{billing_account}".format( billing_account=billing_account, ) @@ -6477,7 +6600,7 @@ def test_common_billing_account_path(): def test_parse_common_billing_account_path(): expected = { - "billing_account": "clam", + "billing_account": "abalone", } path = GeneratorsClient.common_billing_account_path(**expected) @@ -6487,7 +6610,7 @@ def test_parse_common_billing_account_path(): def test_common_folder_path(): - folder = "whelk" + folder = "squid" expected = "folders/{folder}".format( folder=folder, ) @@ -6497,7 +6620,7 @@ def test_common_folder_path(): def test_parse_common_folder_path(): expected = { - "folder": "octopus", + "folder": "clam", } path = GeneratorsClient.common_folder_path(**expected) @@ -6507,7 +6630,7 @@ def test_parse_common_folder_path(): def test_common_organization_path(): - organization = "oyster" + organization = "whelk" expected = "organizations/{organization}".format( organization=organization, ) @@ -6517,7 +6640,7 @@ def test_common_organization_path(): def test_parse_common_organization_path(): expected = { - "organization": "nudibranch", + "organization": "octopus", } path = GeneratorsClient.common_organization_path(**expected) @@ -6527,7 +6650,7 @@ def test_parse_common_organization_path(): def test_common_project_path(): - project = "cuttlefish" + project = "oyster" expected = "projects/{project}".format( project=project, ) @@ -6537,7 +6660,7 @@ def test_common_project_path(): def test_parse_common_project_path(): expected = { - "project": "mussel", + "project": "nudibranch", } path = GeneratorsClient.common_project_path(**expected) @@ -6547,8 +6670,8 @@ def test_parse_common_project_path(): def test_common_location_path(): - project = "winkle" - location = "nautilus" + project = "cuttlefish" + location = "mussel" expected = "projects/{project}/locations/{location}".format( project=project, location=location, @@ -6559,8 +6682,8 @@ def test_common_location_path(): def test_parse_common_location_path(): expected = { - "project": "scallop", - "location": "abalone", + "project": "winkle", + "location": "nautilus", } path = GeneratorsClient.common_location_path(**expected) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_intents.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_intents.py index 299674f31f95..c101a17d2d77 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_intents.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_intents.py @@ -62,10 +62,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.intents import ( IntentsAsyncClient, IntentsClient, @@ -74,6 +70,9 @@ ) from google.cloud.dialogflow_v2beta1.types import context, intent from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_knowledge_bases.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_knowledge_bases.py index 4173f859cdbc..03b09b9b1d1a 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_knowledge_bases.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_knowledge_bases.py @@ -56,10 +56,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.knowledge_bases import ( KnowledgeBasesAsyncClient, KnowledgeBasesClient, @@ -68,6 +64,9 @@ ) from google.cloud.dialogflow_v2beta1.types import knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_participants.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_participants.py index 856c7716eec0..9947768bef29 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_participants.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_participants.py @@ -60,10 +60,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.participants import ( ParticipantsAsyncClient, ParticipantsClient, @@ -80,6 +76,9 @@ session_entity_type, ) from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -10970,10 +10969,65 @@ def test_parse_answer_record_path(): assert expected == actual -def test_context_path(): +def test_app_path(): project = "oyster" - session = "nudibranch" - context = "cuttlefish" + location = "nudibranch" + app = "cuttlefish" + expected = "projects/{project}/locations/{location}/apps/{app}".format( + project=project, + location=location, + app=app, + ) + actual = ParticipantsClient.app_path(project, location, app) + assert expected == actual + + +def test_parse_app_path(): + expected = { + "project": "mussel", + "location": "winkle", + "app": "nautilus", + } + path = ParticipantsClient.app_path(**expected) + + # Check that the path construction is reversible. + actual = ParticipantsClient.parse_app_path(path) + assert expected == actual + + +def test_ces_tool_path(): + project = "scallop" + location = "abalone" + app = "squid" + tool = "clam" + expected = "projects/{project}/locations/{location}/apps/{app}/tools/{tool}".format( + project=project, + location=location, + app=app, + tool=tool, + ) + actual = ParticipantsClient.ces_tool_path(project, location, app, tool) + assert expected == actual + + +def test_parse_ces_tool_path(): + expected = { + "project": "whelk", + "location": "octopus", + "app": "oyster", + "tool": "nudibranch", + } + path = ParticipantsClient.ces_tool_path(**expected) + + # Check that the path construction is reversible. + actual = ParticipantsClient.parse_ces_tool_path(path) + assert expected == actual + + +def test_context_path(): + project = "cuttlefish" + session = "mussel" + context = "winkle" expected = "projects/{project}/agent/sessions/{session}/contexts/{context}".format( project=project, session=session, @@ -10985,9 +11039,9 @@ def test_context_path(): def test_parse_context_path(): expected = { - "project": "mussel", - "session": "winkle", - "context": "nautilus", + "project": "nautilus", + "session": "scallop", + "context": "abalone", } path = ParticipantsClient.context_path(**expected) @@ -10997,9 +11051,9 @@ def test_parse_context_path(): def test_document_path(): - project = "scallop" - knowledge_base = "abalone" - document = "squid" + project = "squid" + knowledge_base = "clam" + document = "whelk" expected = "projects/{project}/knowledgeBases/{knowledge_base}/documents/{document}".format( project=project, knowledge_base=knowledge_base, @@ -11011,9 +11065,9 @@ def test_document_path(): def test_parse_document_path(): expected = { - "project": "clam", - "knowledge_base": "whelk", - "document": "octopus", + "project": "octopus", + "knowledge_base": "oyster", + "document": "nudibranch", } path = ParticipantsClient.document_path(**expected) @@ -11023,8 +11077,8 @@ def test_parse_document_path(): def test_intent_path(): - project = "oyster" - intent = "nudibranch" + project = "cuttlefish" + intent = "mussel" expected = "projects/{project}/agent/intents/{intent}".format( project=project, intent=intent, @@ -11035,8 +11089,8 @@ def test_intent_path(): def test_parse_intent_path(): expected = { - "project": "cuttlefish", - "intent": "mussel", + "project": "winkle", + "intent": "nautilus", } path = ParticipantsClient.intent_path(**expected) @@ -11046,9 +11100,9 @@ def test_parse_intent_path(): def test_message_path(): - project = "winkle" - conversation = "nautilus" - message = "scallop" + project = "scallop" + conversation = "abalone" + message = "squid" expected = ( "projects/{project}/conversations/{conversation}/messages/{message}".format( project=project, @@ -11062,9 +11116,9 @@ def test_message_path(): def test_parse_message_path(): expected = { - "project": "abalone", - "conversation": "squid", - "message": "clam", + "project": "clam", + "conversation": "whelk", + "message": "octopus", } path = ParticipantsClient.message_path(**expected) @@ -11074,9 +11128,9 @@ def test_parse_message_path(): def test_participant_path(): - project = "whelk" - conversation = "octopus" - participant = "oyster" + project = "oyster" + conversation = "nudibranch" + participant = "cuttlefish" expected = "projects/{project}/conversations/{conversation}/participants/{participant}".format( project=project, conversation=conversation, @@ -11088,9 +11142,9 @@ def test_participant_path(): def test_parse_participant_path(): expected = { - "project": "nudibranch", - "conversation": "cuttlefish", - "participant": "mussel", + "project": "mussel", + "conversation": "winkle", + "participant": "nautilus", } path = ParticipantsClient.participant_path(**expected) @@ -11100,9 +11154,9 @@ def test_parse_participant_path(): def test_phrase_set_path(): - project = "winkle" - location = "nautilus" - phrase_set = "scallop" + project = "scallop" + location = "abalone" + phrase_set = "squid" expected = "projects/{project}/locations/{location}/phraseSets/{phrase_set}".format( project=project, location=location, @@ -11114,9 +11168,9 @@ def test_phrase_set_path(): def test_parse_phrase_set_path(): expected = { - "project": "abalone", - "location": "squid", - "phrase_set": "clam", + "project": "clam", + "location": "whelk", + "phrase_set": "octopus", } path = ParticipantsClient.phrase_set_path(**expected) @@ -11126,9 +11180,9 @@ def test_parse_phrase_set_path(): def test_session_entity_type_path(): - project = "whelk" - session = "octopus" - entity_type = "oyster" + project = "oyster" + session = "nudibranch" + entity_type = "cuttlefish" expected = ( "projects/{project}/agent/sessions/{session}/entityTypes/{entity_type}".format( project=project, @@ -11142,9 +11196,9 @@ def test_session_entity_type_path(): def test_parse_session_entity_type_path(): expected = { - "project": "nudibranch", - "session": "cuttlefish", - "entity_type": "mussel", + "project": "mussel", + "session": "winkle", + "entity_type": "nautilus", } path = ParticipantsClient.session_entity_type_path(**expected) @@ -11154,9 +11208,9 @@ def test_parse_session_entity_type_path(): def test_tool_path(): - project = "winkle" - location = "nautilus" - tool = "scallop" + project = "scallop" + location = "abalone" + tool = "squid" expected = "projects/{project}/locations/{location}/tools/{tool}".format( project=project, location=location, @@ -11168,9 +11222,9 @@ def test_tool_path(): def test_parse_tool_path(): expected = { - "project": "abalone", - "location": "squid", - "tool": "clam", + "project": "clam", + "location": "whelk", + "tool": "octopus", } path = ParticipantsClient.tool_path(**expected) @@ -11179,8 +11233,39 @@ def test_parse_tool_path(): assert expected == actual +def test_toolset_path(): + project = "oyster" + location = "nudibranch" + app = "cuttlefish" + toolset = "mussel" + expected = ( + "projects/{project}/locations/{location}/apps/{app}/toolsets/{toolset}".format( + project=project, + location=location, + app=app, + toolset=toolset, + ) + ) + actual = ParticipantsClient.toolset_path(project, location, app, toolset) + assert expected == actual + + +def test_parse_toolset_path(): + expected = { + "project": "winkle", + "location": "nautilus", + "app": "scallop", + "toolset": "abalone", + } + path = ParticipantsClient.toolset_path(**expected) + + # Check that the path construction is reversible. + actual = ParticipantsClient.parse_toolset_path(path) + assert expected == actual + + def test_common_billing_account_path(): - billing_account = "whelk" + billing_account = "squid" expected = "billingAccounts/{billing_account}".format( billing_account=billing_account, ) @@ -11190,7 +11275,7 @@ def test_common_billing_account_path(): def test_parse_common_billing_account_path(): expected = { - "billing_account": "octopus", + "billing_account": "clam", } path = ParticipantsClient.common_billing_account_path(**expected) @@ -11200,7 +11285,7 @@ def test_parse_common_billing_account_path(): def test_common_folder_path(): - folder = "oyster" + folder = "whelk" expected = "folders/{folder}".format( folder=folder, ) @@ -11210,7 +11295,7 @@ def test_common_folder_path(): def test_parse_common_folder_path(): expected = { - "folder": "nudibranch", + "folder": "octopus", } path = ParticipantsClient.common_folder_path(**expected) @@ -11220,7 +11305,7 @@ def test_parse_common_folder_path(): def test_common_organization_path(): - organization = "cuttlefish" + organization = "oyster" expected = "organizations/{organization}".format( organization=organization, ) @@ -11230,7 +11315,7 @@ def test_common_organization_path(): def test_parse_common_organization_path(): expected = { - "organization": "mussel", + "organization": "nudibranch", } path = ParticipantsClient.common_organization_path(**expected) @@ -11240,7 +11325,7 @@ def test_parse_common_organization_path(): def test_common_project_path(): - project = "winkle" + project = "cuttlefish" expected = "projects/{project}".format( project=project, ) @@ -11250,7 +11335,7 @@ def test_common_project_path(): def test_parse_common_project_path(): expected = { - "project": "nautilus", + "project": "mussel", } path = ParticipantsClient.common_project_path(**expected) @@ -11260,8 +11345,8 @@ def test_parse_common_project_path(): def test_common_location_path(): - project = "scallop" - location = "abalone" + project = "winkle" + location = "nautilus" expected = "projects/{project}/locations/{location}".format( project=project, location=location, @@ -11272,8 +11357,8 @@ def test_common_location_path(): def test_parse_common_location_path(): expected = { - "project": "squid", - "location": "clam", + "project": "scallop", + "location": "abalone", } path = ParticipantsClient.common_location_path(**expected) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_phone_numbers.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_phone_numbers.py index e797629dbffb..4229db056cb5 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_phone_numbers.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_phone_numbers.py @@ -45,6 +45,7 @@ import google.auth import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( client_options, gapic_v1, @@ -56,10 +57,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.phone_numbers import ( PhoneNumbersAsyncClient, PhoneNumbersClient, @@ -68,6 +65,9 @@ ) from google.cloud.dialogflow_v2beta1.types import phone_number from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -4249,6 +4249,11 @@ def test_update_phone_number_rest_call_success(request_type): "phone_number": "phone_number_value", "conversation_profile": "conversation_profile_value", "lifecycle_state": 1, + "allowed_sip_trunks": { + "sip_trunks": ["sip_trunks_value1", "sip_trunks_value2"], + "carrier_ids": ["carrier_ids_value1", "carrier_ids_value2"], + }, + "purge_time": {"seconds": 751, "nanos": 543}, } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency @@ -5568,8 +5573,34 @@ def test_parse_phone_number_path(): assert expected == actual +def test_sip_trunk_path(): + project = "oyster" + location = "nudibranch" + siptrunk = "cuttlefish" + expected = "projects/{project}/locations/{location}/sipTrunks/{siptrunk}".format( + project=project, + location=location, + siptrunk=siptrunk, + ) + actual = PhoneNumbersClient.sip_trunk_path(project, location, siptrunk) + assert expected == actual + + +def test_parse_sip_trunk_path(): + expected = { + "project": "mussel", + "location": "winkle", + "siptrunk": "nautilus", + } + path = PhoneNumbersClient.sip_trunk_path(**expected) + + # Check that the path construction is reversible. + actual = PhoneNumbersClient.parse_sip_trunk_path(path) + assert expected == actual + + def test_common_billing_account_path(): - billing_account = "oyster" + billing_account = "scallop" expected = "billingAccounts/{billing_account}".format( billing_account=billing_account, ) @@ -5579,7 +5610,7 @@ def test_common_billing_account_path(): def test_parse_common_billing_account_path(): expected = { - "billing_account": "nudibranch", + "billing_account": "abalone", } path = PhoneNumbersClient.common_billing_account_path(**expected) @@ -5589,7 +5620,7 @@ def test_parse_common_billing_account_path(): def test_common_folder_path(): - folder = "cuttlefish" + folder = "squid" expected = "folders/{folder}".format( folder=folder, ) @@ -5599,7 +5630,7 @@ def test_common_folder_path(): def test_parse_common_folder_path(): expected = { - "folder": "mussel", + "folder": "clam", } path = PhoneNumbersClient.common_folder_path(**expected) @@ -5609,7 +5640,7 @@ def test_parse_common_folder_path(): def test_common_organization_path(): - organization = "winkle" + organization = "whelk" expected = "organizations/{organization}".format( organization=organization, ) @@ -5619,7 +5650,7 @@ def test_common_organization_path(): def test_parse_common_organization_path(): expected = { - "organization": "nautilus", + "organization": "octopus", } path = PhoneNumbersClient.common_organization_path(**expected) @@ -5629,7 +5660,7 @@ def test_parse_common_organization_path(): def test_common_project_path(): - project = "scallop" + project = "oyster" expected = "projects/{project}".format( project=project, ) @@ -5639,7 +5670,7 @@ def test_common_project_path(): def test_parse_common_project_path(): expected = { - "project": "abalone", + "project": "nudibranch", } path = PhoneNumbersClient.common_project_path(**expected) @@ -5649,8 +5680,8 @@ def test_parse_common_project_path(): def test_common_location_path(): - project = "squid" - location = "clam" + project = "cuttlefish" + location = "mussel" expected = "projects/{project}/locations/{location}".format( project=project, location=location, @@ -5661,8 +5692,8 @@ def test_common_location_path(): def test_parse_common_location_path(): expected = { - "project": "whelk", - "location": "octopus", + "project": "winkle", + "location": "nautilus", } path = PhoneNumbersClient.common_location_path(**expected) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_session_entity_types.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_session_entity_types.py index 76ec861bd4b1..5179d78d8e25 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_session_entity_types.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_session_entity_types.py @@ -56,10 +56,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.session_entity_types import ( SessionEntityTypesAsyncClient, SessionEntityTypesClient, @@ -70,6 +66,9 @@ from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sessions.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sessions.py index fce0cf866292..d8fa7fa69ae1 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sessions.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sessions.py @@ -60,10 +60,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.sessions import ( SessionsAsyncClient, SessionsClient, @@ -78,6 +74,9 @@ session_entity_type, ) from google.cloud.dialogflow_v2beta1.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 CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sip_trunks.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sip_trunks.py index bf047d85e5d6..ce3a25d88753 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sip_trunks.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sip_trunks.py @@ -57,10 +57,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.sip_trunks import ( SipTrunksAsyncClient, SipTrunksClient, @@ -69,6 +65,9 @@ ) from google.cloud.dialogflow_v2beta1.types import sip_trunk from google.cloud.dialogflow_v2beta1.types import sip_trunk as gcd_sip_trunk +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_tools.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_tools.py index dc7d53a46703..ddd9b1487890 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_tools.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_tools.py @@ -58,10 +58,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.tools import ( ToolsAsyncClient, ToolsClient, @@ -70,6 +66,9 @@ ) from google.cloud.dialogflow_v2beta1.types import tool from google.cloud.dialogflow_v2beta1.types import tool as gcd_tool +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file", diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_versions.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_versions.py index f0874ad831b3..f1e0f9751765 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_versions.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_versions.py @@ -57,10 +57,6 @@ from google.api_core import retry as retries 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.dialogflow_v2beta1.services.versions import ( VersionsAsyncClient, VersionsClient, @@ -69,6 +65,9 @@ ) from google.cloud.dialogflow_v2beta1.types import version from google.cloud.dialogflow_v2beta1.types import version as gcd_version +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account CRED_INFO_JSON = { "credential_source": "/path/to/file",