Skip to content

fix: [google-cloud-discoveryengine] support blended search #12433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
parthea merged 7 commits into from
Mar 12, 2024
Merged

fix: [google-cloud-discoveryengine] support blended search #12433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8877e08
feat: support blended search
gcf-owl-bot[bot] Mar 9, 2024
f98b907
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Mar 9, 2024
422b400
feat: support acl-based and blended search
gcf-owl-bot[bot] Mar 9, 2024
3457f21
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Mar 9, 2024
7071c98
Merge branch 'main' into owl-bot-copy-packages-google-cloud-discovery…
parthea Mar 9, 2024
e7fa1e1
fix!: `http_uri` fix for method `ListChunks` in service `ChunkService`
gcf-owl-bot[bot] Mar 11, 2024
8ad2073
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...oogle-cloud-discoveryengine/docs/discoveryengine_v1alpha/acl_config_service.rst
View file
Open in desktop
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:
10 changes: 10 additions & 0 deletions ...ges/google-cloud-discoveryengine/docs/discoveryengine_v1alpha/chunk_service.rst
View file
Open in desktop
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:
6 changes: 6 additions & 0 deletions ...cloud-discoveryengine/docs/discoveryengine_v1alpha/estimate_billing_service.rst
View file
Open in desktop
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:
4 changes: 4 additions & 0 deletions packages/google-cloud-discoveryengine/docs/discoveryengine_v1alpha/services_.rst
View file
Open in desktop
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
10 changes: 10 additions & 0 deletions ...e-cloud-discoveryengine/docs/discoveryengine_v1alpha/serving_config_service.rst
View file
Open in desktop
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:
6 changes: 6 additions & 0 deletions ...gle-cloud-discoveryengine/docs/discoveryengine_v1beta/search_tuning_service.rst
View file
Open in desktop
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:
1 change: 1 addition & 0 deletions packages/google-cloud-discoveryengine/docs/discoveryengine_v1beta/services_.rst
View file
Open in desktop
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
20 changes: 20 additions & 0 deletions packages/google-cloud-discoveryengine/google/cloud/discoveryengine/__init__.py
View file
Open in desktop
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
84 changes: 84 additions & 0 deletions packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/__init__.py
View file
Open in desktop
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