Skip to content

Commit

Permalink
fix: [google-cloud-discoveryengine] support blended search (#12433)
Browse files Browse the repository at this point in the history
- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 614683212

Source-Link:
googleapis/googleapis@716a939

Source-Link:
googleapis/googleapis-gen@a54c012
Copy-Tag:
eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRpc2NvdmVyeWVuZ2luZS8uT3dsQm90LnlhbWwiLCJoIjoiYTU0YzAxMjY4Njg0NTUxNDhjMzM5Y2U4ODIwOWRjYTA0OWU4NDE3MSJ9

BEGIN_COMMIT_OVERRIDE
feat: support acl-based and blended search
feat: support chunk-based document search
feat: support search adaptor based search
feat: support batch documents purge with GCS input
feat: add document processing config services
feat: add serving config services
feat: add billing estimation services
feat: add suggestion deny list import/purge services
docs: keep the API doc up-to-date with recent changes
feat: support boost in multi-turn search
feat: add search tuning services
feat: allow setting schema on schema creation

END_COMMIT_OVERRIDE

BEGIN_NESTED_COMMIT
feat: [google-cloud-discoveryengine] support acl-based and blended
search
feat: support chunk-based document search
feat: support search adaptor based search
feat: support batch documents purge with GCS input
feat: add document processing config services
feat: add serving config services
feat: add billing estimation services
feat: add suggestion deny list import/purge services
docs: keep the API doc up-to-date with recent changes

PiperOrigin-RevId: 614160461

Source-Link:
googleapis/googleapis@b553626

Source-Link:
googleapis/googleapis-gen@4394e37
Copy-Tag:
eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRpc2NvdmVyeWVuZ2luZS8uT3dsQm90LnlhbWwiLCJoIjoiNDM5NGUzNzA0ZDRkMDQ2OTdlZjU0ZDE2ZmZiN2Q1MDU3YWIzYTJmZSJ9
END_NESTED_COMMIT
BEGIN_NESTED_COMMIT
feat: [google-cloud-discoveryengine] support blended search
feat: support boost in multi-turn search
feat: add document processing config services
feat: add search tuning services
feat: allow setting schema on schema creation
docs: keep the API doc up-to-date with recent changes

PiperOrigin-RevId: 614046598

Source-Link:
googleapis/googleapis@d66613f

Source-Link:
googleapis/googleapis-gen@3d65645
Copy-Tag:
eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRpc2NvdmVyeWVuZ2luZS8uT3dsQm90LnlhbWwiLCJoIjoiM2Q2NTY0NTBkM2E2NzZjZWFiNzA3OGM2NzNmMmUwNTI0M2UwMWQ4ZiJ9
END_NESTED_COMMIT

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
  • Loading branch information
3 people committed Mar 12, 2024
1 parent c2c997b commit 9b1d014
Show file tree
Hide file tree
Showing 179 changed files with 47,973 additions and 2,298 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
AclConfigService
----------------------------------

.. automodule:: google.cloud.discoveryengine_v1alpha.services.acl_config_service
:members:
:inherited-members:
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ChunkService
------------------------------

.. automodule:: google.cloud.discoveryengine_v1alpha.services.chunk_service
:members:
:inherited-members:

.. automodule:: google.cloud.discoveryengine_v1alpha.services.chunk_service.pagers
:members:
:inherited-members:
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
EstimateBillingService
----------------------------------------

.. automodule:: google.cloud.discoveryengine_v1alpha.services.estimate_billing_service
:members:
:inherited-members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@ Services for Google Cloud Discoveryengine v1alpha API
.. toctree::
:maxdepth: 2

acl_config_service
chunk_service
completion_service
conversational_search_service
data_store_service
document_service
engine_service
estimate_billing_service
recommendation_service
schema_service
search_service
search_tuning_service
serving_config_service
site_search_engine_service
user_event_service
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ServingConfigService
--------------------------------------

.. automodule:: google.cloud.discoveryengine_v1alpha.services.serving_config_service
:members:
:inherited-members:

.. automodule:: google.cloud.discoveryengine_v1alpha.services.serving_config_service.pagers
:members:
:inherited-members:
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
SearchTuningService
-------------------------------------

.. automodule:: google.cloud.discoveryengine_v1beta.services.search_tuning_service
:members:
:inherited-members:
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Services for Google Cloud Discoveryengine v1beta API
recommendation_service
schema_service
search_service
search_tuning_service
serving_config_service
site_search_engine_service
user_event_service
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@
from google.cloud.discoveryengine_v1beta.services.search_service.client import (
SearchServiceClient,
)
from google.cloud.discoveryengine_v1beta.services.search_tuning_service.async_client import (
SearchTuningServiceAsyncClient,
)
from google.cloud.discoveryengine_v1beta.services.search_tuning_service.client import (
SearchTuningServiceClient,
)
from google.cloud.discoveryengine_v1beta.services.serving_config_service.async_client import (
ServingConfigServiceAsyncClient,
)
Expand Down Expand Up @@ -129,6 +135,9 @@
UpdateDataStoreRequest,
)
from google.cloud.discoveryengine_v1beta.types.document import Document
from google.cloud.discoveryengine_v1beta.types.document_processing_config import (
DocumentProcessingConfig,
)
from google.cloud.discoveryengine_v1beta.types.document_service import (
CreateDocumentRequest,
DeleteDocumentRequest,
Expand Down Expand Up @@ -190,6 +199,11 @@
SearchRequest,
SearchResponse,
)
from google.cloud.discoveryengine_v1beta.types.search_tuning_service import (
TrainCustomModelMetadata,
TrainCustomModelRequest,
TrainCustomModelResponse,
)
from google.cloud.discoveryengine_v1beta.types.serving_config import ServingConfig
from google.cloud.discoveryengine_v1beta.types.serving_config_service import (
GetServingConfigRequest,
Expand Down Expand Up @@ -263,6 +277,8 @@
"SchemaServiceAsyncClient",
"SearchServiceClient",
"SearchServiceAsyncClient",
"SearchTuningServiceClient",
"SearchTuningServiceAsyncClient",
"ServingConfigServiceClient",
"ServingConfigServiceAsyncClient",
"SiteSearchEngineServiceClient",
Expand Down Expand Up @@ -304,6 +320,7 @@
"ListDataStoresResponse",
"UpdateDataStoreRequest",
"Document",
"DocumentProcessingConfig",
"CreateDocumentRequest",
"DeleteDocumentRequest",
"GetDocumentRequest",
Expand Down Expand Up @@ -351,6 +368,9 @@
"UpdateSchemaRequest",
"SearchRequest",
"SearchResponse",
"TrainCustomModelMetadata",
"TrainCustomModelRequest",
"TrainCustomModelResponse",
"ServingConfig",
"GetServingConfigRequest",
"ListServingConfigsRequest",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
__version__ = package_version.__version__


from .services.acl_config_service import (
AclConfigServiceAsyncClient,
AclConfigServiceClient,
)
from .services.chunk_service import ChunkServiceAsyncClient, ChunkServiceClient
from .services.completion_service import (
CompletionServiceAsyncClient,
CompletionServiceClient,
Expand All @@ -32,6 +37,10 @@
)
from .services.document_service import DocumentServiceAsyncClient, DocumentServiceClient
from .services.engine_service import EngineServiceAsyncClient, EngineServiceClient
from .services.estimate_billing_service import (
EstimateBillingServiceAsyncClient,
EstimateBillingServiceClient,
)
from .services.recommendation_service import (
RecommendationServiceAsyncClient,
RecommendationServiceClient,
Expand All @@ -42,6 +51,10 @@
SearchTuningServiceAsyncClient,
SearchTuningServiceClient,
)
from .services.serving_config_service import (
ServingConfigServiceAsyncClient,
ServingConfigServiceClient,
)
from .services.site_search_engine_service import (
SiteSearchEngineServiceAsyncClient,
SiteSearchEngineServiceClient,
Expand All @@ -50,16 +63,26 @@
UserEventServiceAsyncClient,
UserEventServiceClient,
)
from .types.acl_config import AclConfig
from .types.acl_config_service import GetAclConfigRequest, UpdateAclConfigRequest
from .types.chunk import Chunk
from .types.chunk_service import GetChunkRequest, ListChunksRequest, ListChunksResponse
from .types.common import (
CustomAttribute,
CustomFineTuningSpec,
DoubleList,
EmbeddingConfig,
GuidedSearchSpec,
IdpConfig,
IndustryVertical,
Interval,
Principal,
SearchAddOn,
SearchTier,
SolutionType,
UserInfo,
)
from .types.completion import SuggestionDenyListEntry
from .types.completion_service import CompleteQueryRequest, CompleteQueryResponse
from .types.conversation import (
Conversation,
Expand All @@ -85,11 +108,14 @@
DeleteDataStoreMetadata,
DeleteDataStoreRequest,
GetDataStoreRequest,
GetDocumentProcessingConfigRequest,
ListDataStoresRequest,
ListDataStoresResponse,
UpdateDataStoreRequest,
UpdateDocumentProcessingConfigRequest,
)
from .types.document import Document
from .types.document_processing_config import DocumentProcessingConfig
from .types.document_service import (
CreateDocumentRequest,
DeleteDocumentRequest,
Expand All @@ -114,13 +140,21 @@
TuneEngineResponse,
UpdateEngineRequest,
)
from .types.estimate_billing_service import (
EstimateDataSizeMetadata,
EstimateDataSizeRequest,
EstimateDataSizeResponse,
)
from .types.import_config import (
BigQuerySource,
GcsSource,
ImportDocumentsMetadata,
ImportDocumentsRequest,
ImportDocumentsResponse,
ImportErrorConfig,
ImportSuggestionDenyListEntriesMetadata,
ImportSuggestionDenyListEntriesRequest,
ImportSuggestionDenyListEntriesResponse,
ImportUserEventsMetadata,
ImportUserEventsRequest,
ImportUserEventsResponse,
Expand All @@ -129,6 +163,10 @@
PurgeDocumentsMetadata,
PurgeDocumentsRequest,
PurgeDocumentsResponse,
PurgeErrorConfig,
PurgeSuggestionDenyListEntriesMetadata,
PurgeSuggestionDenyListEntriesRequest,
PurgeSuggestionDenyListEntriesResponse,
PurgeUserEventsMetadata,
PurgeUserEventsRequest,
PurgeUserEventsResponse,
Expand All @@ -152,6 +190,13 @@
TrainCustomModelRequest,
TrainCustomModelResponse,
)
from .types.serving_config import ServingConfig
from .types.serving_config_service import (
GetServingConfigRequest,
ListServingConfigsRequest,
ListServingConfigsResponse,
UpdateServingConfigRequest,
)
from .types.site_search_engine import SiteSearchEngine, SiteVerificationInfo, TargetSite
from .types.site_search_engine_service import (
BatchCreateTargetSiteMetadata,
Expand Down Expand Up @@ -195,24 +240,32 @@
from .types.user_event_service import CollectUserEventRequest, WriteUserEventRequest

__all__ = (
"AclConfigServiceAsyncClient",
"ChunkServiceAsyncClient",
"CompletionServiceAsyncClient",
"ConversationalSearchServiceAsyncClient",
"DataStoreServiceAsyncClient",
"DocumentServiceAsyncClient",
"EngineServiceAsyncClient",
"EstimateBillingServiceAsyncClient",
"RecommendationServiceAsyncClient",
"SchemaServiceAsyncClient",
"SearchServiceAsyncClient",
"SearchTuningServiceAsyncClient",
"ServingConfigServiceAsyncClient",
"SiteSearchEngineServiceAsyncClient",
"UserEventServiceAsyncClient",
"AclConfig",
"AclConfigServiceClient",
"BatchCreateTargetSiteMetadata",
"BatchCreateTargetSitesRequest",
"BatchCreateTargetSitesResponse",
"BatchVerifyTargetSitesMetadata",
"BatchVerifyTargetSitesRequest",
"BatchVerifyTargetSitesResponse",
"BigQuerySource",
"Chunk",
"ChunkServiceClient",
"CollectUserEventRequest",
"CompleteQueryRequest",
"CompleteQueryResponse",
Expand All @@ -235,6 +288,7 @@
"CreateTargetSiteMetadata",
"CreateTargetSiteRequest",
"CustomAttribute",
"CustomFineTuningSpec",
"DataStore",
"DataStoreServiceClient",
"DeleteConversationRequest",
Expand All @@ -252,33 +306,50 @@
"DisableAdvancedSiteSearchResponse",
"Document",
"DocumentInfo",
"DocumentProcessingConfig",
"DocumentServiceClient",
"DoubleList",
"EmbeddingConfig",
"EnableAdvancedSiteSearchMetadata",
"EnableAdvancedSiteSearchRequest",
"EnableAdvancedSiteSearchResponse",
"Engine",
"EngineServiceClient",
"EstimateBillingServiceClient",
"EstimateDataSizeMetadata",
"EstimateDataSizeRequest",
"EstimateDataSizeResponse",
"FetchDomainVerificationStatusRequest",
"FetchDomainVerificationStatusResponse",
"FieldConfig",
"GcsSource",
"GetAclConfigRequest",
"GetChunkRequest",
"GetConversationRequest",
"GetDataStoreRequest",
"GetDocumentProcessingConfigRequest",
"GetDocumentRequest",
"GetEngineRequest",
"GetSchemaRequest",
"GetServingConfigRequest",
"GetSiteSearchEngineRequest",
"GetTargetSiteRequest",
"GuidedSearchSpec",
"IdpConfig",
"ImportDocumentsMetadata",
"ImportDocumentsRequest",
"ImportDocumentsResponse",
"ImportErrorConfig",
"ImportSuggestionDenyListEntriesMetadata",
"ImportSuggestionDenyListEntriesRequest",
"ImportSuggestionDenyListEntriesResponse",
"ImportUserEventsMetadata",
"ImportUserEventsRequest",
"ImportUserEventsResponse",
"IndustryVertical",
"Interval",
"ListChunksRequest",
"ListChunksResponse",
"ListConversationsRequest",
"ListConversationsResponse",
"ListDataStoresRequest",
Expand All @@ -289,15 +360,22 @@
"ListEnginesResponse",
"ListSchemasRequest",
"ListSchemasResponse",
"ListServingConfigsRequest",
"ListServingConfigsResponse",
"ListTargetSitesRequest",
"ListTargetSitesResponse",
"MediaInfo",
"PageInfo",
"PanelInfo",
"PauseEngineRequest",
"Principal",
"PurgeDocumentsMetadata",
"PurgeDocumentsRequest",
"PurgeDocumentsResponse",
"PurgeErrorConfig",
"PurgeSuggestionDenyListEntriesMetadata",
"PurgeSuggestionDenyListEntriesRequest",
"PurgeSuggestionDenyListEntriesResponse",
"PurgeUserEventsMetadata",
"PurgeUserEventsRequest",
"PurgeUserEventsResponse",
Expand All @@ -318,10 +396,13 @@
"SearchServiceClient",
"SearchTier",
"SearchTuningServiceClient",
"ServingConfig",
"ServingConfigServiceClient",
"SiteSearchEngine",
"SiteSearchEngineServiceClient",
"SiteVerificationInfo",
"SolutionType",
"SuggestionDenyListEntry",
"TargetSite",
"TextInput",
"TrainCustomModelMetadata",
Expand All @@ -331,12 +412,15 @@
"TuneEngineMetadata",
"TuneEngineRequest",
"TuneEngineResponse",
"UpdateAclConfigRequest",
"UpdateConversationRequest",
"UpdateDataStoreRequest",
"UpdateDocumentProcessingConfigRequest",
"UpdateDocumentRequest",
"UpdateEngineRequest",
"UpdateSchemaMetadata",
"UpdateSchemaRequest",
"UpdateServingConfigRequest",
"UpdateTargetSiteMetadata",
"UpdateTargetSiteRequest",
"UserEvent",
Expand Down
Loading

0 comments on commit 9b1d014

Please sign in to comment.