Skip to content

Commit 9b1d014

Browse files
gcf-owl-bot[bot]parthea
gcf-owl-bot[bot]
and
parthea
authored
fix: [google-cloud-discoveryengine] support blended search (googleapis#12433)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 614683212 Source-Link: googleapis/googleapis@716a939 Source-Link: https://github.com/googleapis/googleapis-gen/commit/a54c0126868455148c339ce88209dca049e84171 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: https://github.com/googleapis/googleapis-gen/commit/4394e3704d4d04697ef54d16ffb7d5057ab3a2fe 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: https://github.com/googleapis/googleapis-gen/commit/3d656450d3a676ceab7078c673f2e05243e01d8f 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>
1 parent c2c997b commit 9b1d014

179 files changed

Lines changed: 47973 additions & 2298 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/google-cloud-discoveryengine/docs/discoveryengine_v1alpha/acl_config_service.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
AclConfigService
2+
----------------------------------
3+
4+
.. automodule:: google.cloud.discoveryengine_v1alpha.services.acl_config_service
5+
:members:
6+
:inherited-members:

‎packages/google-cloud-discoveryengine/docs/discoveryengine_v1alpha/chunk_service.rst‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
ChunkService
2+
------------------------------
3+
4+
.. automodule:: google.cloud.discoveryengine_v1alpha.services.chunk_service
5+
:members:
6+
:inherited-members:
7+
8+
.. automodule:: google.cloud.discoveryengine_v1alpha.services.chunk_service.pagers
9+
:members:
10+
:inherited-members:

‎packages/google-cloud-discoveryengine/docs/discoveryengine_v1alpha/estimate_billing_service.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
EstimateBillingService
2+
----------------------------------------
3+
4+
.. automodule:: google.cloud.discoveryengine_v1alpha.services.estimate_billing_service
5+
:members:
6+
:inherited-members:

‎packages/google-cloud-discoveryengine/docs/discoveryengine_v1alpha/services_.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,18 @@ Services for Google Cloud Discoveryengine v1alpha API
33
.. toctree::
44
:maxdepth: 2
55

6+
acl_config_service
7+
chunk_service
68
completion_service
79
conversational_search_service
810
data_store_service
911
document_service
1012
engine_service
13+
estimate_billing_service
1114
recommendation_service
1215
schema_service
1316
search_service
1417
search_tuning_service
18+
serving_config_service
1519
site_search_engine_service
1620
user_event_service

‎packages/google-cloud-discoveryengine/docs/discoveryengine_v1alpha/serving_config_service.rst‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
ServingConfigService
2+
--------------------------------------
3+
4+
.. automodule:: google.cloud.discoveryengine_v1alpha.services.serving_config_service
5+
:members:
6+
:inherited-members:
7+
8+
.. automodule:: google.cloud.discoveryengine_v1alpha.services.serving_config_service.pagers
9+
:members:
10+
:inherited-members:

‎packages/google-cloud-discoveryengine/docs/discoveryengine_v1beta/search_tuning_service.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
SearchTuningService
2+
-------------------------------------
3+
4+
.. automodule:: google.cloud.discoveryengine_v1beta.services.search_tuning_service
5+
:members:
6+
:inherited-members:

‎packages/google-cloud-discoveryengine/docs/discoveryengine_v1beta/services_.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Services for Google Cloud Discoveryengine v1beta API
1111
recommendation_service
1212
schema_service
1313
search_service
14+
search_tuning_service
1415
serving_config_service
1516
site_search_engine_service
1617
user_event_service

‎packages/google-cloud-discoveryengine/google/cloud/discoveryengine/__init__.py‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@
6666
from google.cloud.discoveryengine_v1beta.services.search_service.client import (
6767
SearchServiceClient,
6868
)
69+
from google.cloud.discoveryengine_v1beta.services.search_tuning_service.async_client import (
70+
SearchTuningServiceAsyncClient,
71+
)
72+
from google.cloud.discoveryengine_v1beta.services.search_tuning_service.client import (
73+
SearchTuningServiceClient,
74+
)
6975
from google.cloud.discoveryengine_v1beta.services.serving_config_service.async_client import (
7076
ServingConfigServiceAsyncClient,
7177
)
@@ -129,6 +135,9 @@
129135
UpdateDataStoreRequest,
130136
)
131137
from google.cloud.discoveryengine_v1beta.types.document import Document
138+
from google.cloud.discoveryengine_v1beta.types.document_processing_config import (
139+
DocumentProcessingConfig,
140+
)
132141
from google.cloud.discoveryengine_v1beta.types.document_service import (
133142
CreateDocumentRequest,
134143
DeleteDocumentRequest,
@@ -190,6 +199,11 @@
190199
SearchRequest,
191200
SearchResponse,
192201
)
202+
from google.cloud.discoveryengine_v1beta.types.search_tuning_service import (
203+
TrainCustomModelMetadata,
204+
TrainCustomModelRequest,
205+
TrainCustomModelResponse,
206+
)
193207
from google.cloud.discoveryengine_v1beta.types.serving_config import ServingConfig
194208
from google.cloud.discoveryengine_v1beta.types.serving_config_service import (
195209
GetServingConfigRequest,
@@ -263,6 +277,8 @@
263277
"SchemaServiceAsyncClient",
264278
"SearchServiceClient",
265279
"SearchServiceAsyncClient",
280+
"SearchTuningServiceClient",
281+
"SearchTuningServiceAsyncClient",
266282
"ServingConfigServiceClient",
267283
"ServingConfigServiceAsyncClient",
268284
"SiteSearchEngineServiceClient",
@@ -304,6 +320,7 @@
304320
"ListDataStoresResponse",
305321
"UpdateDataStoreRequest",
306322
"Document",
323+
"DocumentProcessingConfig",
307324
"CreateDocumentRequest",
308325
"DeleteDocumentRequest",
309326
"GetDocumentRequest",
@@ -351,6 +368,9 @@
351368
"UpdateSchemaRequest",
352369
"SearchRequest",
353370
"SearchResponse",
371+
"TrainCustomModelMetadata",
372+
"TrainCustomModelRequest",
373+
"TrainCustomModelResponse",
354374
"ServingConfig",
355375
"GetServingConfigRequest",
356376
"ListServingConfigsRequest",

‎packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/__init__.py‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818
__version__ = package_version.__version__
1919

2020

21+
from .services.acl_config_service import (
22+
AclConfigServiceAsyncClient,
23+
AclConfigServiceClient,
24+
)
25+
from .services.chunk_service import ChunkServiceAsyncClient, ChunkServiceClient
2126
from .services.completion_service import (
2227
CompletionServiceAsyncClient,
2328
CompletionServiceClient,
@@ -32,6 +37,10 @@
3237
)
3338
from .services.document_service import DocumentServiceAsyncClient, DocumentServiceClient
3439
from .services.engine_service import EngineServiceAsyncClient, EngineServiceClient
40+
from .services.estimate_billing_service import (
41+
EstimateBillingServiceAsyncClient,
42+
EstimateBillingServiceClient,
43+
)
3544
from .services.recommendation_service import (
3645
RecommendationServiceAsyncClient,
3746
RecommendationServiceClient,
@@ -42,6 +51,10 @@
4251
SearchTuningServiceAsyncClient,
4352
SearchTuningServiceClient,
4453
)
54+
from .services.serving_config_service import (
55+
ServingConfigServiceAsyncClient,
56+
ServingConfigServiceClient,
57+
)
4558
from .services.site_search_engine_service import (
4659
SiteSearchEngineServiceAsyncClient,
4760
SiteSearchEngineServiceClient,
@@ -50,16 +63,26 @@
5063
UserEventServiceAsyncClient,
5164
UserEventServiceClient,
5265
)
66+
from .types.acl_config import AclConfig
67+
from .types.acl_config_service import GetAclConfigRequest, UpdateAclConfigRequest
68+
from .types.chunk import Chunk
69+
from .types.chunk_service import GetChunkRequest, ListChunksRequest, ListChunksResponse
5370
from .types.common import (
5471
CustomAttribute,
72+
CustomFineTuningSpec,
5573
DoubleList,
74+
EmbeddingConfig,
75+
GuidedSearchSpec,
76+
IdpConfig,
5677
IndustryVertical,
5778
Interval,
79+
Principal,
5880
SearchAddOn,
5981
SearchTier,
6082
SolutionType,
6183
UserInfo,
6284
)
85+
from .types.completion import SuggestionDenyListEntry
6386
from .types.completion_service import CompleteQueryRequest, CompleteQueryResponse
6487
from .types.conversation import (
6588
Conversation,
@@ -85,11 +108,14 @@
85108
DeleteDataStoreMetadata,
86109
DeleteDataStoreRequest,
87110
GetDataStoreRequest,
111+
GetDocumentProcessingConfigRequest,
88112
ListDataStoresRequest,
89113
ListDataStoresResponse,
90114
UpdateDataStoreRequest,
115+
UpdateDocumentProcessingConfigRequest,
91116
)
92117
from .types.document import Document
118+
from .types.document_processing_config import DocumentProcessingConfig
93119
from .types.document_service import (
94120
CreateDocumentRequest,
95121
DeleteDocumentRequest,
@@ -114,13 +140,21 @@
114140
TuneEngineResponse,
115141
UpdateEngineRequest,
116142
)
143+
from .types.estimate_billing_service import (
144+
EstimateDataSizeMetadata,
145+
EstimateDataSizeRequest,
146+
EstimateDataSizeResponse,
147+
)
117148
from .types.import_config import (
118149
BigQuerySource,
119150
GcsSource,
120151
ImportDocumentsMetadata,
121152
ImportDocumentsRequest,
122153
ImportDocumentsResponse,
123154
ImportErrorConfig,
155+
ImportSuggestionDenyListEntriesMetadata,
156+
ImportSuggestionDenyListEntriesRequest,
157+
ImportSuggestionDenyListEntriesResponse,
124158
ImportUserEventsMetadata,
125159
ImportUserEventsRequest,
126160
ImportUserEventsResponse,
@@ -129,6 +163,10 @@
129163
PurgeDocumentsMetadata,
130164
PurgeDocumentsRequest,
131165
PurgeDocumentsResponse,
166+
PurgeErrorConfig,
167+
PurgeSuggestionDenyListEntriesMetadata,
168+
PurgeSuggestionDenyListEntriesRequest,
169+
PurgeSuggestionDenyListEntriesResponse,
132170
PurgeUserEventsMetadata,
133171
PurgeUserEventsRequest,
134172
PurgeUserEventsResponse,
@@ -152,6 +190,13 @@
152190
TrainCustomModelRequest,
153191
TrainCustomModelResponse,
154192
)
193+
from .types.serving_config import ServingConfig
194+
from .types.serving_config_service import (
195+
GetServingConfigRequest,
196+
ListServingConfigsRequest,
197+
ListServingConfigsResponse,
198+
UpdateServingConfigRequest,
199+
)
155200
from .types.site_search_engine import SiteSearchEngine, SiteVerificationInfo, TargetSite
156201
from .types.site_search_engine_service import (
157202
BatchCreateTargetSiteMetadata,
@@ -195,24 +240,32 @@
195240
from .types.user_event_service import CollectUserEventRequest, WriteUserEventRequest
196241

197242
__all__ = (
243+
"AclConfigServiceAsyncClient",
244+
"ChunkServiceAsyncClient",
198245
"CompletionServiceAsyncClient",
199246
"ConversationalSearchServiceAsyncClient",
200247
"DataStoreServiceAsyncClient",
201248
"DocumentServiceAsyncClient",
202249
"EngineServiceAsyncClient",
250+
"EstimateBillingServiceAsyncClient",
203251
"RecommendationServiceAsyncClient",
204252
"SchemaServiceAsyncClient",
205253
"SearchServiceAsyncClient",
206254
"SearchTuningServiceAsyncClient",
255+
"ServingConfigServiceAsyncClient",
207256
"SiteSearchEngineServiceAsyncClient",
208257
"UserEventServiceAsyncClient",
258+
"AclConfig",
259+
"AclConfigServiceClient",
209260
"BatchCreateTargetSiteMetadata",
210261
"BatchCreateTargetSitesRequest",
211262
"BatchCreateTargetSitesResponse",
212263
"BatchVerifyTargetSitesMetadata",
213264
"BatchVerifyTargetSitesRequest",
214265
"BatchVerifyTargetSitesResponse",
215266
"BigQuerySource",
267+
"Chunk",
268+
"ChunkServiceClient",
216269
"CollectUserEventRequest",
217270
"CompleteQueryRequest",
218271
"CompleteQueryResponse",
@@ -235,6 +288,7 @@
235288
"CreateTargetSiteMetadata",
236289
"CreateTargetSiteRequest",
237290
"CustomAttribute",
291+
"CustomFineTuningSpec",
238292
"DataStore",
239293
"DataStoreServiceClient",
240294
"DeleteConversationRequest",
@@ -252,33 +306,50 @@
252306
"DisableAdvancedSiteSearchResponse",
253307
"Document",
254308
"DocumentInfo",
309+
"DocumentProcessingConfig",
255310
"DocumentServiceClient",
256311
"DoubleList",
312+
"EmbeddingConfig",
257313
"EnableAdvancedSiteSearchMetadata",
258314
"EnableAdvancedSiteSearchRequest",
259315
"EnableAdvancedSiteSearchResponse",
260316
"Engine",
261317
"EngineServiceClient",
318+
"EstimateBillingServiceClient",
319+
"EstimateDataSizeMetadata",
320+
"EstimateDataSizeRequest",
321+
"EstimateDataSizeResponse",
262322
"FetchDomainVerificationStatusRequest",
263323
"FetchDomainVerificationStatusResponse",
264324
"FieldConfig",
265325
"GcsSource",
326+
"GetAclConfigRequest",
327+
"GetChunkRequest",
266328
"GetConversationRequest",
267329
"GetDataStoreRequest",
330+
"GetDocumentProcessingConfigRequest",
268331
"GetDocumentRequest",
269332
"GetEngineRequest",
270333
"GetSchemaRequest",
334+
"GetServingConfigRequest",
271335
"GetSiteSearchEngineRequest",
272336
"GetTargetSiteRequest",
337+
"GuidedSearchSpec",
338+
"IdpConfig",
273339
"ImportDocumentsMetadata",
274340
"ImportDocumentsRequest",
275341
"ImportDocumentsResponse",
276342
"ImportErrorConfig",
343+
"ImportSuggestionDenyListEntriesMetadata",
344+
"ImportSuggestionDenyListEntriesRequest",
345+
"ImportSuggestionDenyListEntriesResponse",
277346
"ImportUserEventsMetadata",
278347
"ImportUserEventsRequest",
279348
"ImportUserEventsResponse",
280349
"IndustryVertical",
281350
"Interval",
351+
"ListChunksRequest",
352+
"ListChunksResponse",
282353
"ListConversationsRequest",
283354
"ListConversationsResponse",
284355
"ListDataStoresRequest",
@@ -289,15 +360,22 @@
289360
"ListEnginesResponse",
290361
"ListSchemasRequest",
291362
"ListSchemasResponse",
363+
"ListServingConfigsRequest",
364+
"ListServingConfigsResponse",
292365
"ListTargetSitesRequest",
293366
"ListTargetSitesResponse",
294367
"MediaInfo",
295368
"PageInfo",
296369
"PanelInfo",
297370
"PauseEngineRequest",
371+
"Principal",
298372
"PurgeDocumentsMetadata",
299373
"PurgeDocumentsRequest",
300374
"PurgeDocumentsResponse",
375+
"PurgeErrorConfig",
376+
"PurgeSuggestionDenyListEntriesMetadata",
377+
"PurgeSuggestionDenyListEntriesRequest",
378+
"PurgeSuggestionDenyListEntriesResponse",
301379
"PurgeUserEventsMetadata",
302380
"PurgeUserEventsRequest",
303381
"PurgeUserEventsResponse",
@@ -318,10 +396,13 @@
318396
"SearchServiceClient",
319397
"SearchTier",
320398
"SearchTuningServiceClient",
399+
"ServingConfig",
400+
"ServingConfigServiceClient",
321401
"SiteSearchEngine",
322402
"SiteSearchEngineServiceClient",
323403
"SiteVerificationInfo",
324404
"SolutionType",
405+
"SuggestionDenyListEntry",
325406
"TargetSite",
326407
"TextInput",
327408
"TrainCustomModelMetadata",
@@ -331,12 +412,15 @@
331412
"TuneEngineMetadata",
332413
"TuneEngineRequest",
333414
"TuneEngineResponse",
415+
"UpdateAclConfigRequest",
334416
"UpdateConversationRequest",
335417
"UpdateDataStoreRequest",
418+
"UpdateDocumentProcessingConfigRequest",
336419
"UpdateDocumentRequest",
337420
"UpdateEngineRequest",
338421
"UpdateSchemaMetadata",
339422
"UpdateSchemaRequest",
423+
"UpdateServingConfigRequest",
340424
"UpdateTargetSiteMetadata",
341425
"UpdateTargetSiteRequest",
342426
"UserEvent",

0 commit comments

Comments
 (0)