diff --git a/discoveryengine/v1alpha/discoveryengine-api.json b/discoveryengine/v1alpha/discoveryengine-api.json index f27ea23f9cd..aa5a6ca26fc 100644 --- a/discoveryengine/v1alpha/discoveryengine-api.json +++ b/discoveryengine/v1alpha/discoveryengine-api.json @@ -629,7 +629,7 @@ ], "parameters": { "name": { - "description": "Output only. The full resource name of the Document Processing Config. Format: `projects/*/locations/*/collections/*/dataStores/*/documentProcessingConfig`.", + "description": "The full resource name of the Document Processing Config. Format: `projects/*/locations/*/collections/*/dataStores/*/documentProcessingConfig`.", "location": "path", "pattern": "^projects/[^/]+/locations/[^/]+/collections/[^/]+/dataStores/[^/]+/documentProcessingConfig$", "required": true, @@ -3134,7 +3134,7 @@ ], "parameters": { "name": { - "description": "Output only. The full resource name of the Document Processing Config. Format: `projects/*/locations/*/collections/*/dataStores/*/documentProcessingConfig`.", + "description": "The full resource name of the Document Processing Config. Format: `projects/*/locations/*/collections/*/dataStores/*/documentProcessingConfig`.", "location": "path", "pattern": "^projects/[^/]+/locations/[^/]+/dataStores/[^/]+/documentProcessingConfig$", "required": true, @@ -4596,7 +4596,7 @@ } } }, - "revision": "20240123", + "revision": "20240129", "rootUrl": "https://discoveryengine.googleapis.com/", "schemas": { "GoogleApiHttpBody": { @@ -6203,6 +6203,12 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1alphaDigitalParsingConfig": { + "description": "The digital parsing configurations for documents.", + "id": "GoogleCloudDiscoveryengineV1alphaDigitalParsingConfig", + "properties": {}, + "type": "object" + }, "GoogleCloudDiscoveryengineV1alphaDisableAdvancedSiteSearchMetadata": { "description": "Metadata related to the progress of the SiteSearchEngineService.DisableAdvancedSiteSearch operation. This will be returned by the google.longrunning.Operation.metadata field.", "id": "GoogleCloudDiscoveryengineV1alphaDisableAdvancedSiteSearchMetadata", @@ -6335,14 +6341,44 @@ "description": "A singleton resource of DataStore. It's empty when DataStore is created, which defaults to digital parser. The first call to DataStoreService.UpdateDocumentProcessingConfig method will initialize the config.", "id": "GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfig", "properties": { + "defaultParsingConfig": { + "$ref": "GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig", + "description": "Configurations for default Document parser. If not specified, we will configure it as default DigitalParsingConfig, and the default parsing config will be applied to all file types for Document parsing." + }, "name": { - "description": "Output only. The full resource name of the Document Processing Config. Format: `projects/*/locations/*/collections/*/dataStores/*/documentProcessingConfig`.", - "readOnly": true, + "description": "The full resource name of the Document Processing Config. Format: `projects/*/locations/*/collections/*/dataStores/*/documentProcessingConfig`.", "type": "string" }, "ocrConfig": { "$ref": "GoogleCloudDiscoveryengineV1alphaOcrConfig", - "description": "The OCR config. Currently it only applies to PDFs." + "deprecated": true, + "description": "[DEPRECATED] This field is deprecated. To specify OCR parsing config, please specify `ocr_parsing_config` in `default_parsing_config` field The OCR config. Currently it only applies to PDFs." + }, + "parsingConfigOverrides": { + "additionalProperties": { + "$ref": "GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig" + }, + "description": "Map from file type to override the default parsing configuration based on the file type. Supported keys: * `pdf`: Override parsing config for PDF files, either digital parsing, ocr parsing or layout parsing is supported. * `html`: Override parsing config for HTML files, only digital parsing and or layout parsing are supported.", + "type": "object" + } + }, + "type": "object" + }, + "GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig": { + "description": "Related configurations applied to a specific type of document parser.", + "id": "GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig", + "properties": { + "digitalParsingConfig": { + "$ref": "GoogleCloudDiscoveryengineV1alphaDigitalParsingConfig", + "description": "Configurations applied to digital parser." + }, + "layoutParsingConfig": { + "$ref": "GoogleCloudDiscoveryengineV1alphaLayoutParsingConfig", + "description": "Configurations applied to layout parser." + }, + "ocrParsingConfig": { + "$ref": "GoogleCloudDiscoveryengineV1alphaOcrParsingConfig", + "description": "Configurations applied to OCR parser. Currently it only applies to PDFs." } }, "type": "object" @@ -7248,6 +7284,12 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1alphaLayoutParsingConfig": { + "description": "The layout parsing configurations for documents.", + "id": "GoogleCloudDiscoveryengineV1alphaLayoutParsingConfig", + "properties": {}, + "type": "object" + }, "GoogleCloudDiscoveryengineV1alphaListConversationsResponse": { "description": "Response for ListConversations method.", "id": "GoogleCloudDiscoveryengineV1alphaListConversationsResponse", @@ -7401,6 +7443,7 @@ "type": "object" }, "GoogleCloudDiscoveryengineV1alphaOcrConfig": { + "deprecated": true, "description": "The OCR options for parsing documents.", "id": "GoogleCloudDiscoveryengineV1alphaOcrConfig", "properties": { @@ -7422,6 +7465,24 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1alphaOcrParsingConfig": { + "description": "The OCR parsing configurations for documents.", + "id": "GoogleCloudDiscoveryengineV1alphaOcrParsingConfig", + "properties": { + "enhancedDocumentElements": { + "description": "Apply additional enhanced OCR processing to a list of document elements. Supported values: * `table`: advanced table parsing model.", + "items": { + "type": "string" + }, + "type": "array" + }, + "useNativeText": { + "description": "If true, will use native text instead of OCR text on pages containing native text.", + "type": "boolean" + } + }, + "type": "object" + }, "GoogleCloudDiscoveryengineV1alphaPageInfo": { "description": "Detailed page information.", "id": "GoogleCloudDiscoveryengineV1alphaPageInfo", diff --git a/discoveryengine/v1alpha/discoveryengine-gen.go b/discoveryengine/v1alpha/discoveryengine-gen.go index 0c3c728fc70..1fd6500f77c 100644 --- a/discoveryengine/v1alpha/discoveryengine-gen.go +++ b/discoveryengine/v1alpha/discoveryengine-gen.go @@ -3575,6 +3575,11 @@ func (s *GoogleCloudDiscoveryengineV1alphaDeleteTargetSiteMetadata) MarshalJSON( return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1alphaDigitalParsingConfig: The digital +// parsing configurations for documents. +type GoogleCloudDiscoveryengineV1alphaDigitalParsingConfig struct { +} + // GoogleCloudDiscoveryengineV1alphaDisableAdvancedSiteSearchMetadata: // Metadata related to the progress of the // SiteSearchEngineService.DisableAdvancedSiteSearch operation. This @@ -3796,33 +3801,52 @@ func (s *GoogleCloudDiscoveryengineV1alphaDocumentInfo) MarshalJSON() ([]byte, e // DataStoreService.UpdateDocumentProcessingConfig method will // initialize the config. type GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfig struct { - // Name: Output only. The full resource name of the Document Processing - // Config. Format: + // DefaultParsingConfig: Configurations for default Document parser. If + // not specified, we will configure it as default DigitalParsingConfig, + // and the default parsing config will be applied to all file types for + // Document parsing. + DefaultParsingConfig *GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig `json:"defaultParsingConfig,omitempty"` + + // Name: The full resource name of the Document Processing Config. + // Format: // `projects/*/locations/*/collections/*/dataStores/*/documentProcessingC // onfig`. Name string `json:"name,omitempty"` - // OcrConfig: The OCR config. Currently it only applies to PDFs. + // OcrConfig: [DEPRECATED] This field is deprecated. To specify OCR + // parsing config, please specify `ocr_parsing_config` in + // `default_parsing_config` field The OCR config. Currently it only + // applies to PDFs. OcrConfig *GoogleCloudDiscoveryengineV1alphaOcrConfig `json:"ocrConfig,omitempty"` + // ParsingConfigOverrides: Map from file type to override the default + // parsing configuration based on the file type. Supported keys: * + // `pdf`: Override parsing config for PDF files, either digital parsing, + // ocr parsing or layout parsing is supported. * `html`: Override + // parsing config for HTML files, only digital parsing and or layout + // parsing are supported. + ParsingConfigOverrides map[string]GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig `json:"parsingConfigOverrides,omitempty"` + // ServerResponse contains the HTTP response code and headers from the // server. googleapi.ServerResponse `json:"-"` - // ForceSendFields is a list of field names (e.g. "Name") to - // unconditionally include in API requests. By default, fields with - // empty or default values are omitted from API requests. However, any - // non-pointer, non-interface field appearing in ForceSendFields will be - // sent to the server regardless of whether the field is empty or not. - // This may be used to include empty fields in Patch requests. + // ForceSendFields is a list of field names (e.g. + // "DefaultParsingConfig") to unconditionally include in API requests. + // By default, fields with empty or default values are omitted from API + // requests. However, any non-pointer, non-interface field appearing in + // ForceSendFields will be sent to the server regardless of whether the + // field is empty or not. This may be used to include empty fields in + // Patch requests. ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "Name") to include in API - // requests with the JSON null value. By default, fields with empty - // values are omitted from API requests. However, any field with an - // empty value appearing in NullFields will be sent to the server as - // null. It is an error if a field in this list has a non-empty value. - // This may be used to include null fields in Patch requests. + // NullFields is a list of field names (e.g. "DefaultParsingConfig") to + // include in API requests with the JSON null value. By default, fields + // with empty values are omitted from API requests. However, any field + // with an empty value appearing in NullFields will be sent to the + // server as null. It is an error if a field in this list has a + // non-empty value. This may be used to include null fields in Patch + // requests. NullFields []string `json:"-"` } @@ -3832,6 +3856,45 @@ func (s *GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfig) MarshalJSON( return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig +// : Related configurations applied to a specific type of document +// parser. +type GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig struct { + // DigitalParsingConfig: Configurations applied to digital parser. + DigitalParsingConfig *GoogleCloudDiscoveryengineV1alphaDigitalParsingConfig `json:"digitalParsingConfig,omitempty"` + + // LayoutParsingConfig: Configurations applied to layout parser. + LayoutParsingConfig *GoogleCloudDiscoveryengineV1alphaLayoutParsingConfig `json:"layoutParsingConfig,omitempty"` + + // OcrParsingConfig: Configurations applied to OCR parser. Currently it + // only applies to PDFs. + OcrParsingConfig *GoogleCloudDiscoveryengineV1alphaOcrParsingConfig `json:"ocrParsingConfig,omitempty"` + + // ForceSendFields is a list of field names (e.g. + // "DigitalParsingConfig") to unconditionally include in API requests. + // By default, fields with empty or default values are omitted from API + // requests. However, any non-pointer, non-interface field appearing in + // ForceSendFields will be sent to the server regardless of whether the + // field is empty or not. This may be used to include empty fields in + // Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "DigitalParsingConfig") to + // include in API requests with the JSON null value. By default, fields + // with empty values are omitted from API requests. However, any field + // with an empty value appearing in NullFields will be sent to the + // server as null. It is an error if a field in this list has a + // non-empty value. This may be used to include null fields in Patch + // requests. + NullFields []string `json:"-"` +} + +func (s *GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // GoogleCloudDiscoveryengineV1alphaDoubleList: Double list. type GoogleCloudDiscoveryengineV1alphaDoubleList struct { // Values: Double values. @@ -5470,6 +5533,11 @@ func (s *GoogleCloudDiscoveryengineV1alphaInterval) UnmarshalJSON(data []byte) e return nil } +// GoogleCloudDiscoveryengineV1alphaLayoutParsingConfig: The layout +// parsing configurations for documents. +type GoogleCloudDiscoveryengineV1alphaLayoutParsingConfig struct { +} + // GoogleCloudDiscoveryengineV1alphaListConversationsResponse: Response // for ListConversations method. type GoogleCloudDiscoveryengineV1alphaListConversationsResponse struct { @@ -5860,6 +5928,43 @@ func (s *GoogleCloudDiscoveryengineV1alphaOcrConfig) MarshalJSON() ([]byte, erro return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1alphaOcrParsingConfig: The OCR parsing +// configurations for documents. +type GoogleCloudDiscoveryengineV1alphaOcrParsingConfig struct { + // EnhancedDocumentElements: Apply additional enhanced OCR processing to + // a list of document elements. Supported values: * `table`: advanced + // table parsing model. + EnhancedDocumentElements []string `json:"enhancedDocumentElements,omitempty"` + + // UseNativeText: If true, will use native text instead of OCR text on + // pages containing native text. + UseNativeText bool `json:"useNativeText,omitempty"` + + // ForceSendFields is a list of field names (e.g. + // "EnhancedDocumentElements") to unconditionally include in API + // requests. By default, fields with empty or default values are omitted + // from API requests. However, any non-pointer, non-interface field + // appearing in ForceSendFields will be sent to the server regardless of + // whether the field is empty or not. This may be used to include empty + // fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "EnhancedDocumentElements") + // to include in API requests with the JSON null value. By default, + // fields with empty values are omitted from API requests. However, any + // field with an empty value appearing in NullFields will be sent to the + // server as null. It is an error if a field in this list has a + // non-empty value. This may be used to include null fields in Patch + // requests. + NullFields []string `json:"-"` +} + +func (s *GoogleCloudDiscoveryengineV1alphaOcrParsingConfig) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudDiscoveryengineV1alphaOcrParsingConfig + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // GoogleCloudDiscoveryengineV1alphaPageInfo: Detailed page information. type GoogleCloudDiscoveryengineV1alphaPageInfo struct { // PageCategory: The most specific category associated with a category @@ -14069,8 +14174,8 @@ type ProjectsLocationsCollectionsDataStoresUpdateDocumentProcessingConfigCall st // empty when DataStore is created. The first call to this method will // set up DocumentProcessingConfig. // -// - name: Output only. The full resource name of the Document -// Processing Config. Format: +// - name: The full resource name of the Document Processing Config. +// Format: // `projects/*/locations/*/collections/*/dataStores/*/documentProcessin // gConfig`. func (r *ProjectsLocationsCollectionsDataStoresService) UpdateDocumentProcessingConfig(name string, googleclouddiscoveryenginev1alphadocumentprocessingconfig *GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfig) *ProjectsLocationsCollectionsDataStoresUpdateDocumentProcessingConfigCall { @@ -14193,7 +14298,7 @@ func (c *ProjectsLocationsCollectionsDataStoresUpdateDocumentProcessingConfigCal // ], // "parameters": { // "name": { - // "description": "Output only. The full resource name of the Document Processing Config. Format: `projects/*/locations/*/collections/*/dataStores/*/documentProcessingConfig`.", + // "description": "The full resource name of the Document Processing Config. Format: `projects/*/locations/*/collections/*/dataStores/*/documentProcessingConfig`.", // "location": "path", // "pattern": "^projects/[^/]+/locations/[^/]+/collections/[^/]+/dataStores/[^/]+/documentProcessingConfig$", // "required": true, @@ -26879,8 +26984,8 @@ type ProjectsLocationsDataStoresUpdateDocumentProcessingConfigCall struct { // empty when DataStore is created. The first call to this method will // set up DocumentProcessingConfig. // -// - name: Output only. The full resource name of the Document -// Processing Config. Format: +// - name: The full resource name of the Document Processing Config. +// Format: // `projects/*/locations/*/collections/*/dataStores/*/documentProcessin // gConfig`. func (r *ProjectsLocationsDataStoresService) UpdateDocumentProcessingConfig(name string, googleclouddiscoveryenginev1alphadocumentprocessingconfig *GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfig) *ProjectsLocationsDataStoresUpdateDocumentProcessingConfigCall { @@ -27003,7 +27108,7 @@ func (c *ProjectsLocationsDataStoresUpdateDocumentProcessingConfigCall) Do(opts // ], // "parameters": { // "name": { - // "description": "Output only. The full resource name of the Document Processing Config. Format: `projects/*/locations/*/collections/*/dataStores/*/documentProcessingConfig`.", + // "description": "The full resource name of the Document Processing Config. Format: `projects/*/locations/*/collections/*/dataStores/*/documentProcessingConfig`.", // "location": "path", // "pattern": "^projects/[^/]+/locations/[^/]+/dataStores/[^/]+/documentProcessingConfig$", // "required": true, diff --git a/discoveryengine/v1beta/discoveryengine-api.json b/discoveryengine/v1beta/discoveryengine-api.json index 2f29aba07f6..39c3f2ab607 100644 --- a/discoveryengine/v1beta/discoveryengine-api.json +++ b/discoveryengine/v1beta/discoveryengine-api.json @@ -4164,7 +4164,7 @@ } } }, - "revision": "20240123", + "revision": "20240129", "rootUrl": "https://discoveryengine.googleapis.com/", "schemas": { "GoogleApiHttpBody": { @@ -5435,6 +5435,12 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1alphaDigitalParsingConfig": { + "description": "The digital parsing configurations for documents.", + "id": "GoogleCloudDiscoveryengineV1alphaDigitalParsingConfig", + "properties": {}, + "type": "object" + }, "GoogleCloudDiscoveryengineV1alphaDisableAdvancedSiteSearchMetadata": { "description": "Metadata related to the progress of the SiteSearchEngineService.DisableAdvancedSiteSearch operation. This will be returned by the google.longrunning.Operation.metadata field.", "id": "GoogleCloudDiscoveryengineV1alphaDisableAdvancedSiteSearchMetadata", @@ -5462,14 +5468,44 @@ "description": "A singleton resource of DataStore. It's empty when DataStore is created, which defaults to digital parser. The first call to DataStoreService.UpdateDocumentProcessingConfig method will initialize the config.", "id": "GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfig", "properties": { + "defaultParsingConfig": { + "$ref": "GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig", + "description": "Configurations for default Document parser. If not specified, we will configure it as default DigitalParsingConfig, and the default parsing config will be applied to all file types for Document parsing." + }, "name": { - "description": "Output only. The full resource name of the Document Processing Config. Format: `projects/*/locations/*/collections/*/dataStores/*/documentProcessingConfig`.", - "readOnly": true, + "description": "The full resource name of the Document Processing Config. Format: `projects/*/locations/*/collections/*/dataStores/*/documentProcessingConfig`.", "type": "string" }, "ocrConfig": { "$ref": "GoogleCloudDiscoveryengineV1alphaOcrConfig", - "description": "The OCR config. Currently it only applies to PDFs." + "deprecated": true, + "description": "[DEPRECATED] This field is deprecated. To specify OCR parsing config, please specify `ocr_parsing_config` in `default_parsing_config` field The OCR config. Currently it only applies to PDFs." + }, + "parsingConfigOverrides": { + "additionalProperties": { + "$ref": "GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig" + }, + "description": "Map from file type to override the default parsing configuration based on the file type. Supported keys: * `pdf`: Override parsing config for PDF files, either digital parsing, ocr parsing or layout parsing is supported. * `html`: Override parsing config for HTML files, only digital parsing and or layout parsing are supported.", + "type": "object" + } + }, + "type": "object" + }, + "GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig": { + "description": "Related configurations applied to a specific type of document parser.", + "id": "GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig", + "properties": { + "digitalParsingConfig": { + "$ref": "GoogleCloudDiscoveryengineV1alphaDigitalParsingConfig", + "description": "Configurations applied to digital parser." + }, + "layoutParsingConfig": { + "$ref": "GoogleCloudDiscoveryengineV1alphaLayoutParsingConfig", + "description": "Configurations applied to layout parser." + }, + "ocrParsingConfig": { + "$ref": "GoogleCloudDiscoveryengineV1alphaOcrParsingConfig", + "description": "Configurations applied to OCR parser. Currently it only applies to PDFs." } }, "type": "object" @@ -6098,7 +6134,14 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1alphaLayoutParsingConfig": { + "description": "The layout parsing configurations for documents.", + "id": "GoogleCloudDiscoveryengineV1alphaLayoutParsingConfig", + "properties": {}, + "type": "object" + }, "GoogleCloudDiscoveryengineV1alphaOcrConfig": { + "deprecated": true, "description": "The OCR options for parsing documents.", "id": "GoogleCloudDiscoveryengineV1alphaOcrConfig", "properties": { @@ -6120,6 +6163,24 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1alphaOcrParsingConfig": { + "description": "The OCR parsing configurations for documents.", + "id": "GoogleCloudDiscoveryengineV1alphaOcrParsingConfig", + "properties": { + "enhancedDocumentElements": { + "description": "Apply additional enhanced OCR processing to a list of document elements. Supported values: * `table`: advanced table parsing model.", + "items": { + "type": "string" + }, + "type": "array" + }, + "useNativeText": { + "description": "If true, will use native text instead of OCR text on pages containing native text.", + "type": "boolean" + } + }, + "type": "object" + }, "GoogleCloudDiscoveryengineV1alphaPurgeDocumentsMetadata": { "description": "Metadata related to the progress of the PurgeDocuments operation. This will be returned by the google.longrunning.Operation.metadata field.", "id": "GoogleCloudDiscoveryengineV1alphaPurgeDocumentsMetadata", diff --git a/discoveryengine/v1beta/discoveryengine-gen.go b/discoveryengine/v1beta/discoveryengine-gen.go index 26be6649612..15cbae257af 100644 --- a/discoveryengine/v1beta/discoveryengine-gen.go +++ b/discoveryengine/v1beta/discoveryengine-gen.go @@ -2901,6 +2901,11 @@ func (s *GoogleCloudDiscoveryengineV1alphaDeleteTargetSiteMetadata) MarshalJSON( return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1alphaDigitalParsingConfig: The digital +// parsing configurations for documents. +type GoogleCloudDiscoveryengineV1alphaDigitalParsingConfig struct { +} + // GoogleCloudDiscoveryengineV1alphaDisableAdvancedSiteSearchMetadata: // Metadata related to the progress of the // SiteSearchEngineService.DisableAdvancedSiteSearch operation. This @@ -2948,29 +2953,48 @@ type GoogleCloudDiscoveryengineV1alphaDisableAdvancedSiteSearchResponse struct { // DataStoreService.UpdateDocumentProcessingConfig method will // initialize the config. type GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfig struct { - // Name: Output only. The full resource name of the Document Processing - // Config. Format: + // DefaultParsingConfig: Configurations for default Document parser. If + // not specified, we will configure it as default DigitalParsingConfig, + // and the default parsing config will be applied to all file types for + // Document parsing. + DefaultParsingConfig *GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig `json:"defaultParsingConfig,omitempty"` + + // Name: The full resource name of the Document Processing Config. + // Format: // `projects/*/locations/*/collections/*/dataStores/*/documentProcessingC // onfig`. Name string `json:"name,omitempty"` - // OcrConfig: The OCR config. Currently it only applies to PDFs. + // OcrConfig: [DEPRECATED] This field is deprecated. To specify OCR + // parsing config, please specify `ocr_parsing_config` in + // `default_parsing_config` field The OCR config. Currently it only + // applies to PDFs. OcrConfig *GoogleCloudDiscoveryengineV1alphaOcrConfig `json:"ocrConfig,omitempty"` - // ForceSendFields is a list of field names (e.g. "Name") to - // unconditionally include in API requests. By default, fields with - // empty or default values are omitted from API requests. However, any - // non-pointer, non-interface field appearing in ForceSendFields will be - // sent to the server regardless of whether the field is empty or not. - // This may be used to include empty fields in Patch requests. + // ParsingConfigOverrides: Map from file type to override the default + // parsing configuration based on the file type. Supported keys: * + // `pdf`: Override parsing config for PDF files, either digital parsing, + // ocr parsing or layout parsing is supported. * `html`: Override + // parsing config for HTML files, only digital parsing and or layout + // parsing are supported. + ParsingConfigOverrides map[string]GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig `json:"parsingConfigOverrides,omitempty"` + + // ForceSendFields is a list of field names (e.g. + // "DefaultParsingConfig") to unconditionally include in API requests. + // By default, fields with empty or default values are omitted from API + // requests. However, any non-pointer, non-interface field appearing in + // ForceSendFields will be sent to the server regardless of whether the + // field is empty or not. This may be used to include empty fields in + // Patch requests. ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "Name") to include in API - // requests with the JSON null value. By default, fields with empty - // values are omitted from API requests. However, any field with an - // empty value appearing in NullFields will be sent to the server as - // null. It is an error if a field in this list has a non-empty value. - // This may be used to include null fields in Patch requests. + // NullFields is a list of field names (e.g. "DefaultParsingConfig") to + // include in API requests with the JSON null value. By default, fields + // with empty values are omitted from API requests. However, any field + // with an empty value appearing in NullFields will be sent to the + // server as null. It is an error if a field in this list has a + // non-empty value. This may be used to include null fields in Patch + // requests. NullFields []string `json:"-"` } @@ -2980,6 +3004,45 @@ func (s *GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfig) MarshalJSON( return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig +// : Related configurations applied to a specific type of document +// parser. +type GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig struct { + // DigitalParsingConfig: Configurations applied to digital parser. + DigitalParsingConfig *GoogleCloudDiscoveryengineV1alphaDigitalParsingConfig `json:"digitalParsingConfig,omitempty"` + + // LayoutParsingConfig: Configurations applied to layout parser. + LayoutParsingConfig *GoogleCloudDiscoveryengineV1alphaLayoutParsingConfig `json:"layoutParsingConfig,omitempty"` + + // OcrParsingConfig: Configurations applied to OCR parser. Currently it + // only applies to PDFs. + OcrParsingConfig *GoogleCloudDiscoveryengineV1alphaOcrParsingConfig `json:"ocrParsingConfig,omitempty"` + + // ForceSendFields is a list of field names (e.g. + // "DigitalParsingConfig") to unconditionally include in API requests. + // By default, fields with empty or default values are omitted from API + // requests. However, any non-pointer, non-interface field appearing in + // ForceSendFields will be sent to the server regardless of whether the + // field is empty or not. This may be used to include empty fields in + // Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "DigitalParsingConfig") to + // include in API requests with the JSON null value. By default, fields + // with empty values are omitted from API requests. However, any field + // with an empty value appearing in NullFields will be sent to the + // server as null. It is an error if a field in this list has a + // non-empty value. This may be used to include null fields in Patch + // requests. + NullFields []string `json:"-"` +} + +func (s *GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudDiscoveryengineV1alphaDocumentProcessingConfigParsingConfig + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // GoogleCloudDiscoveryengineV1alphaEnableAdvancedSiteSearchMetadata: // Metadata related to the progress of the // SiteSearchEngineService.EnableAdvancedSiteSearch operation. This will @@ -4022,6 +4085,11 @@ func (s *GoogleCloudDiscoveryengineV1alphaImportUserEventsResponse) MarshalJSON( return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1alphaLayoutParsingConfig: The layout +// parsing configurations for documents. +type GoogleCloudDiscoveryengineV1alphaLayoutParsingConfig struct { +} + // GoogleCloudDiscoveryengineV1alphaOcrConfig: The OCR options for // parsing documents. type GoogleCloudDiscoveryengineV1alphaOcrConfig struct { @@ -4062,6 +4130,43 @@ func (s *GoogleCloudDiscoveryengineV1alphaOcrConfig) MarshalJSON() ([]byte, erro return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1alphaOcrParsingConfig: The OCR parsing +// configurations for documents. +type GoogleCloudDiscoveryengineV1alphaOcrParsingConfig struct { + // EnhancedDocumentElements: Apply additional enhanced OCR processing to + // a list of document elements. Supported values: * `table`: advanced + // table parsing model. + EnhancedDocumentElements []string `json:"enhancedDocumentElements,omitempty"` + + // UseNativeText: If true, will use native text instead of OCR text on + // pages containing native text. + UseNativeText bool `json:"useNativeText,omitempty"` + + // ForceSendFields is a list of field names (e.g. + // "EnhancedDocumentElements") to unconditionally include in API + // requests. By default, fields with empty or default values are omitted + // from API requests. However, any non-pointer, non-interface field + // appearing in ForceSendFields will be sent to the server regardless of + // whether the field is empty or not. This may be used to include empty + // fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "EnhancedDocumentElements") + // to include in API requests with the JSON null value. By default, + // fields with empty values are omitted from API requests. However, any + // field with an empty value appearing in NullFields will be sent to the + // server as null. It is an error if a field in this list has a + // non-empty value. This may be used to include null fields in Patch + // requests. + NullFields []string `json:"-"` +} + +func (s *GoogleCloudDiscoveryengineV1alphaOcrParsingConfig) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudDiscoveryengineV1alphaOcrParsingConfig + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // GoogleCloudDiscoveryengineV1alphaPurgeDocumentsMetadata: Metadata // related to the progress of the PurgeDocuments operation. This will be // returned by the google.longrunning.Operation.metadata field. diff --git a/retail/v2/retail-api.json b/retail/v2/retail-api.json index a405aa16c28..35b222e0e16 100644 --- a/retail/v2/retail-api.json +++ b/retail/v2/retail-api.json @@ -2059,7 +2059,7 @@ } } }, - "revision": "20240118", + "revision": "20240129", "rootUrl": "https://retail.googleapis.com/", "schemas": { "GoogleApiHttpBody": { @@ -2540,6 +2540,10 @@ }, "type": "array" }, + "mergedFacet": { + "$ref": "GoogleCloudRetailV2CatalogAttributeFacetConfigMergedFacet", + "description": "Use this field only if you want to merge a facet key into another facet key." + }, "mergedFacetValues": { "description": "Each instance replaces a list of facet values by a merged facet value. If a facet value is not in any list, then it will stay the same. To avoid conflicts, only paths of length 1 are accepted. In other words, if \"dark_blue\" merged into \"BLUE\", then the latter can't merge into \"blues\" because this would create a path of length 2. The maximum number of instances of MergedFacetValue per CatalogAttribute is 100. This feature is available only for textual custom attributes.", "items": { @@ -2578,6 +2582,25 @@ }, "type": "object" }, + "GoogleCloudRetailV2CatalogAttributeFacetConfigMergedFacet": { + "description": "The current facet key (i.e. attribute config) maps into the merged_facet_key. A facet key can have at most one child. The current facet key and the merged facet key need both to be textual custom attributes or both numerical custom attributes (same type).", + "id": "GoogleCloudRetailV2CatalogAttributeFacetConfigMergedFacet", + "properties": { + "mergedFacetKey": { + "description": "The merged facet key should be a valid facet key that is different than the facet key of the current catalog attribute. We refer this is merged facet key as the child of the current catalog attribute. This merged facet key can't be a parent of another facet key (i.e. no directed path of length 2). This merged facet key needs to be either a textual custom attribute or a numerical custom attribute.", + "type": "string" + }, + "mergedFacetValues": { + "deprecated": true, + "description": "Each instance is a list of facet values that map into the same (possibly different) merged facet value. For the current attribute config, each facet value should map to at most one merged facet value.", + "items": { + "$ref": "GoogleCloudRetailV2CatalogAttributeFacetConfigMergedFacetValue" + }, + "type": "array" + } + }, + "type": "object" + }, "GoogleCloudRetailV2CatalogAttributeFacetConfigMergedFacetValue": { "description": "Replaces a set of textual facet values by the same (possibly different) merged facet value. Each facet value should appear at most once as a value per CatalogAttribute. This feature is available only for textual custom attributes.", "id": "GoogleCloudRetailV2CatalogAttributeFacetConfigMergedFacetValue", @@ -3164,7 +3187,7 @@ "type": "string" }, "updateMask": { - "description": "Indicates which fields in the provided imported `products` to update. If not set, all fields are updated.", + "description": "Indicates which fields in the provided imported `products` to update. If not set, all fields are updated. If provided, only the existing product fields are updated. Missing products will not be created.", "format": "google-fieldmask", "type": "string" } diff --git a/retail/v2/retail-gen.go b/retail/v2/retail-gen.go index 48b5fc29810..6238eb75299 100644 --- a/retail/v2/retail-gen.go +++ b/retail/v2/retail-gen.go @@ -1207,6 +1207,10 @@ type GoogleCloudRetailV2CatalogAttributeFacetConfig struct { // maximum number of instances per CatalogAttribute is 25. IgnoredFacetValues []*GoogleCloudRetailV2CatalogAttributeFacetConfigIgnoredFacetValues `json:"ignoredFacetValues,omitempty"` + // MergedFacet: Use this field only if you want to merge a facet key + // into another facet key. + MergedFacet *GoogleCloudRetailV2CatalogAttributeFacetConfigMergedFacet `json:"mergedFacet,omitempty"` + // MergedFacetValues: Each instance replaces a list of facet values by a // merged facet value. If a facet value is not in any list, then it will // stay the same. To avoid conflicts, only paths of length 1 are @@ -1291,6 +1295,51 @@ func (s *GoogleCloudRetailV2CatalogAttributeFacetConfigIgnoredFacetValues) Marsh return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// GoogleCloudRetailV2CatalogAttributeFacetConfigMergedFacet: The +// current facet key (i.e. attribute config) maps into the +// merged_facet_key. A facet key can have at most one child. The current +// facet key and the merged facet key need both to be textual custom +// attributes or both numerical custom attributes (same type). +type GoogleCloudRetailV2CatalogAttributeFacetConfigMergedFacet struct { + // MergedFacetKey: The merged facet key should be a valid facet key that + // is different than the facet key of the current catalog attribute. We + // refer this is merged facet key as the child of the current catalog + // attribute. This merged facet key can't be a parent of another facet + // key (i.e. no directed path of length 2). This merged facet key needs + // to be either a textual custom attribute or a numerical custom + // attribute. + MergedFacetKey string `json:"mergedFacetKey,omitempty"` + + // MergedFacetValues: Each instance is a list of facet values that map + // into the same (possibly different) merged facet value. For the + // current attribute config, each facet value should map to at most one + // merged facet value. + MergedFacetValues []*GoogleCloudRetailV2CatalogAttributeFacetConfigMergedFacetValue `json:"mergedFacetValues,omitempty"` + + // ForceSendFields is a list of field names (e.g. "MergedFacetKey") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "MergedFacetKey") to + // include in API requests with the JSON null value. By default, fields + // with empty values are omitted from API requests. However, any field + // with an empty value appearing in NullFields will be sent to the + // server as null. It is an error if a field in this list has a + // non-empty value. This may be used to include null fields in Patch + // requests. + NullFields []string `json:"-"` +} + +func (s *GoogleCloudRetailV2CatalogAttributeFacetConfigMergedFacet) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudRetailV2CatalogAttributeFacetConfigMergedFacet + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // GoogleCloudRetailV2CatalogAttributeFacetConfigMergedFacetValue: // Replaces a set of textual facet values by the same (possibly // different) merged facet value. Each facet value should appear at most @@ -2454,7 +2503,9 @@ type GoogleCloudRetailV2ImportProductsRequest struct { RequestId string `json:"requestId,omitempty"` // UpdateMask: Indicates which fields in the provided imported - // `products` to update. If not set, all fields are updated. + // `products` to update. If not set, all fields are updated. If + // provided, only the existing product fields are updated. Missing + // products will not be created. UpdateMask string `json:"updateMask,omitempty"` // ForceSendFields is a list of field names (e.g. "ErrorsConfig") to diff --git a/retail/v2alpha/retail-api.json b/retail/v2alpha/retail-api.json index 4e7b6ef3865..101af84353d 100644 --- a/retail/v2alpha/retail-api.json +++ b/retail/v2alpha/retail-api.json @@ -2416,7 +2416,7 @@ } } }, - "revision": "20240118", + "revision": "20240129", "rootUrl": "https://retail.googleapis.com/", "schemas": { "GoogleApiHttpBody": { @@ -3439,6 +3439,10 @@ }, "type": "array" }, + "mergedFacet": { + "$ref": "GoogleCloudRetailV2alphaCatalogAttributeFacetConfigMergedFacet", + "description": "Use this field only if you want to merge a facet key into another facet key." + }, "mergedFacetValues": { "description": "Each instance replaces a list of facet values by a merged facet value. If a facet value is not in any list, then it will stay the same. To avoid conflicts, only paths of length 1 are accepted. In other words, if \"dark_blue\" merged into \"BLUE\", then the latter can't merge into \"blues\" because this would create a path of length 2. The maximum number of instances of MergedFacetValue per CatalogAttribute is 100. This feature is available only for textual custom attributes.", "items": { @@ -3477,6 +3481,25 @@ }, "type": "object" }, + "GoogleCloudRetailV2alphaCatalogAttributeFacetConfigMergedFacet": { + "description": "The current facet key (i.e. attribute config) maps into the merged_facet_key. A facet key can have at most one child. The current facet key and the merged facet key need both to be textual custom attributes or both numerical custom attributes (same type).", + "id": "GoogleCloudRetailV2alphaCatalogAttributeFacetConfigMergedFacet", + "properties": { + "mergedFacetKey": { + "description": "The merged facet key should be a valid facet key that is different than the facet key of the current catalog attribute. We refer this is merged facet key as the child of the current catalog attribute. This merged facet key can't be a parent of another facet key (i.e. no directed path of length 2). This merged facet key needs to be either a textual custom attribute or a numerical custom attribute.", + "type": "string" + }, + "mergedFacetValues": { + "deprecated": true, + "description": "Each instance is a list of facet values that map into the same (possibly different) merged facet value. For the current attribute config, each facet value should map to at most one merged facet value.", + "items": { + "$ref": "GoogleCloudRetailV2alphaCatalogAttributeFacetConfigMergedFacetValue" + }, + "type": "array" + } + }, + "type": "object" + }, "GoogleCloudRetailV2alphaCatalogAttributeFacetConfigMergedFacetValue": { "description": "Replaces a set of textual facet values by the same (possibly different) merged facet value. Each facet value should appear at most once as a value per CatalogAttribute. This feature is available only for textual custom attributes.", "id": "GoogleCloudRetailV2alphaCatalogAttributeFacetConfigMergedFacetValue", @@ -4294,7 +4317,7 @@ "type": "boolean" }, "updateMask": { - "description": "Indicates which fields in the provided imported `products` to update. If not set, all fields are updated.", + "description": "Indicates which fields in the provided imported `products` to update. If not set, all fields are updated. If provided, only the existing product fields are updated. Missing products will not be created.", "format": "google-fieldmask", "type": "string" } diff --git a/retail/v2alpha/retail-gen.go b/retail/v2alpha/retail-gen.go index 66896418929..c25068f4f33 100644 --- a/retail/v2alpha/retail-gen.go +++ b/retail/v2alpha/retail-gen.go @@ -2188,6 +2188,10 @@ type GoogleCloudRetailV2alphaCatalogAttributeFacetConfig struct { // maximum number of instances per CatalogAttribute is 25. IgnoredFacetValues []*GoogleCloudRetailV2alphaCatalogAttributeFacetConfigIgnoredFacetValues `json:"ignoredFacetValues,omitempty"` + // MergedFacet: Use this field only if you want to merge a facet key + // into another facet key. + MergedFacet *GoogleCloudRetailV2alphaCatalogAttributeFacetConfigMergedFacet `json:"mergedFacet,omitempty"` + // MergedFacetValues: Each instance replaces a list of facet values by a // merged facet value. If a facet value is not in any list, then it will // stay the same. To avoid conflicts, only paths of length 1 are @@ -2274,6 +2278,51 @@ func (s *GoogleCloudRetailV2alphaCatalogAttributeFacetConfigIgnoredFacetValues) return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// GoogleCloudRetailV2alphaCatalogAttributeFacetConfigMergedFacet: The +// current facet key (i.e. attribute config) maps into the +// merged_facet_key. A facet key can have at most one child. The current +// facet key and the merged facet key need both to be textual custom +// attributes or both numerical custom attributes (same type). +type GoogleCloudRetailV2alphaCatalogAttributeFacetConfigMergedFacet struct { + // MergedFacetKey: The merged facet key should be a valid facet key that + // is different than the facet key of the current catalog attribute. We + // refer this is merged facet key as the child of the current catalog + // attribute. This merged facet key can't be a parent of another facet + // key (i.e. no directed path of length 2). This merged facet key needs + // to be either a textual custom attribute or a numerical custom + // attribute. + MergedFacetKey string `json:"mergedFacetKey,omitempty"` + + // MergedFacetValues: Each instance is a list of facet values that map + // into the same (possibly different) merged facet value. For the + // current attribute config, each facet value should map to at most one + // merged facet value. + MergedFacetValues []*GoogleCloudRetailV2alphaCatalogAttributeFacetConfigMergedFacetValue `json:"mergedFacetValues,omitempty"` + + // ForceSendFields is a list of field names (e.g. "MergedFacetKey") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "MergedFacetKey") to + // include in API requests with the JSON null value. By default, fields + // with empty values are omitted from API requests. However, any field + // with an empty value appearing in NullFields will be sent to the + // server as null. It is an error if a field in this list has a + // non-empty value. This may be used to include null fields in Patch + // requests. + NullFields []string `json:"-"` +} + +func (s *GoogleCloudRetailV2alphaCatalogAttributeFacetConfigMergedFacet) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudRetailV2alphaCatalogAttributeFacetConfigMergedFacet + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // GoogleCloudRetailV2alphaCatalogAttributeFacetConfigMergedFacetValue: // Replaces a set of textual facet values by the same (possibly // different) merged facet value. Each facet value should appear at most @@ -3866,7 +3915,9 @@ type GoogleCloudRetailV2alphaImportProductsRequest struct { SkipDefaultBranchProtection bool `json:"skipDefaultBranchProtection,omitempty"` // UpdateMask: Indicates which fields in the provided imported - // `products` to update. If not set, all fields are updated. + // `products` to update. If not set, all fields are updated. If + // provided, only the existing product fields are updated. Missing + // products will not be created. UpdateMask string `json:"updateMask,omitempty"` // ForceSendFields is a list of field names (e.g. "ErrorsConfig") to diff --git a/retail/v2beta/retail-api.json b/retail/v2beta/retail-api.json index 2e5bec87eee..f2cec387e3d 100644 --- a/retail/v2beta/retail-api.json +++ b/retail/v2beta/retail-api.json @@ -2115,7 +2115,7 @@ } } }, - "revision": "20240118", + "revision": "20240129", "rootUrl": "https://retail.googleapis.com/", "schemas": { "GoogleApiHttpBody": { @@ -3962,6 +3962,10 @@ }, "type": "array" }, + "mergedFacet": { + "$ref": "GoogleCloudRetailV2betaCatalogAttributeFacetConfigMergedFacet", + "description": "Use this field only if you want to merge a facet key into another facet key." + }, "mergedFacetValues": { "description": "Each instance replaces a list of facet values by a merged facet value. If a facet value is not in any list, then it will stay the same. To avoid conflicts, only paths of length 1 are accepted. In other words, if \"dark_blue\" merged into \"BLUE\", then the latter can't merge into \"blues\" because this would create a path of length 2. The maximum number of instances of MergedFacetValue per CatalogAttribute is 100. This feature is available only for textual custom attributes.", "items": { @@ -4000,6 +4004,25 @@ }, "type": "object" }, + "GoogleCloudRetailV2betaCatalogAttributeFacetConfigMergedFacet": { + "description": "The current facet key (i.e. attribute config) maps into the merged_facet_key. A facet key can have at most one child. The current facet key and the merged facet key need both to be textual custom attributes or both numerical custom attributes (same type).", + "id": "GoogleCloudRetailV2betaCatalogAttributeFacetConfigMergedFacet", + "properties": { + "mergedFacetKey": { + "description": "The merged facet key should be a valid facet key that is different than the facet key of the current catalog attribute. We refer this is merged facet key as the child of the current catalog attribute. This merged facet key can't be a parent of another facet key (i.e. no directed path of length 2). This merged facet key needs to be either a textual custom attribute or a numerical custom attribute.", + "type": "string" + }, + "mergedFacetValues": { + "deprecated": true, + "description": "Each instance is a list of facet values that map into the same (possibly different) merged facet value. For the current attribute config, each facet value should map to at most one merged facet value.", + "items": { + "$ref": "GoogleCloudRetailV2betaCatalogAttributeFacetConfigMergedFacetValue" + }, + "type": "array" + } + }, + "type": "object" + }, "GoogleCloudRetailV2betaCatalogAttributeFacetConfigMergedFacetValue": { "description": "Replaces a set of textual facet values by the same (possibly different) merged facet value. Each facet value should appear at most once as a value per CatalogAttribute. This feature is available only for textual custom attributes.", "id": "GoogleCloudRetailV2betaCatalogAttributeFacetConfigMergedFacetValue", @@ -4728,7 +4751,7 @@ "type": "string" }, "updateMask": { - "description": "Indicates which fields in the provided imported `products` to update. If not set, all fields are updated.", + "description": "Indicates which fields in the provided imported `products` to update. If not set, all fields are updated. If provided, only the existing product fields are updated. Missing products will not be created.", "format": "google-fieldmask", "type": "string" } diff --git a/retail/v2beta/retail-gen.go b/retail/v2beta/retail-gen.go index 6ff23932054..bb421fc321c 100644 --- a/retail/v2beta/retail-gen.go +++ b/retail/v2beta/retail-gen.go @@ -3629,6 +3629,10 @@ type GoogleCloudRetailV2betaCatalogAttributeFacetConfig struct { // maximum number of instances per CatalogAttribute is 25. IgnoredFacetValues []*GoogleCloudRetailV2betaCatalogAttributeFacetConfigIgnoredFacetValues `json:"ignoredFacetValues,omitempty"` + // MergedFacet: Use this field only if you want to merge a facet key + // into another facet key. + MergedFacet *GoogleCloudRetailV2betaCatalogAttributeFacetConfigMergedFacet `json:"mergedFacet,omitempty"` + // MergedFacetValues: Each instance replaces a list of facet values by a // merged facet value. If a facet value is not in any list, then it will // stay the same. To avoid conflicts, only paths of length 1 are @@ -3713,6 +3717,51 @@ func (s *GoogleCloudRetailV2betaCatalogAttributeFacetConfigIgnoredFacetValues) M return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// GoogleCloudRetailV2betaCatalogAttributeFacetConfigMergedFacet: The +// current facet key (i.e. attribute config) maps into the +// merged_facet_key. A facet key can have at most one child. The current +// facet key and the merged facet key need both to be textual custom +// attributes or both numerical custom attributes (same type). +type GoogleCloudRetailV2betaCatalogAttributeFacetConfigMergedFacet struct { + // MergedFacetKey: The merged facet key should be a valid facet key that + // is different than the facet key of the current catalog attribute. We + // refer this is merged facet key as the child of the current catalog + // attribute. This merged facet key can't be a parent of another facet + // key (i.e. no directed path of length 2). This merged facet key needs + // to be either a textual custom attribute or a numerical custom + // attribute. + MergedFacetKey string `json:"mergedFacetKey,omitempty"` + + // MergedFacetValues: Each instance is a list of facet values that map + // into the same (possibly different) merged facet value. For the + // current attribute config, each facet value should map to at most one + // merged facet value. + MergedFacetValues []*GoogleCloudRetailV2betaCatalogAttributeFacetConfigMergedFacetValue `json:"mergedFacetValues,omitempty"` + + // ForceSendFields is a list of field names (e.g. "MergedFacetKey") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "MergedFacetKey") to + // include in API requests with the JSON null value. By default, fields + // with empty values are omitted from API requests. However, any field + // with an empty value appearing in NullFields will be sent to the + // server as null. It is an error if a field in this list has a + // non-empty value. This may be used to include null fields in Patch + // requests. + NullFields []string `json:"-"` +} + +func (s *GoogleCloudRetailV2betaCatalogAttributeFacetConfigMergedFacet) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudRetailV2betaCatalogAttributeFacetConfigMergedFacet + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // GoogleCloudRetailV2betaCatalogAttributeFacetConfigMergedFacetValue: // Replaces a set of textual facet values by the same (possibly // different) merged facet value. Each facet value should appear at most @@ -5171,7 +5220,9 @@ type GoogleCloudRetailV2betaImportProductsRequest struct { RequestId string `json:"requestId,omitempty"` // UpdateMask: Indicates which fields in the provided imported - // `products` to update. If not set, all fields are updated. + // `products` to update. If not set, all fields are updated. If + // provided, only the existing product fields are updated. Missing + // products will not be created. UpdateMask string `json:"updateMask,omitempty"` // ForceSendFields is a list of field names (e.g. "ErrorsConfig") to diff --git a/storagetransfer/v1/storagetransfer-api.json b/storagetransfer/v1/storagetransfer-api.json index ba56ad5163f..d3cc4c01030 100644 --- a/storagetransfer/v1/storagetransfer-api.json +++ b/storagetransfer/v1/storagetransfer-api.json @@ -632,7 +632,7 @@ } } }, - "revision": "20231130", + "revision": "20240126", "rootUrl": "https://storagetransfer.googleapis.com/", "schemas": { "AgentPool": { @@ -936,6 +936,10 @@ "description": "Required. Cloud Storage bucket name. Must meet [Bucket Name Requirements](/storage/docs/naming#requirements).", "type": "string" }, + "managedFolderTransferEnabled": { + "description": "Transfer managed folders is in public preview. This option is only applicable to the Cloud Storage source bucket. If set to true: - The source managed folder will be transferred to the destination bucket - The destination managed folder will always be overwritten, other OVERWRITE options will not be supported", + "type": "boolean" + }, "path": { "description": "Root path to transfer objects. Must be an empty string or full path name that ends with a '/'. This field is treated as an object prefix. As such, it should generally not begin with a '/'. The root path value must meet [Object Name Requirements](/storage/docs/naming#objectnames).", "type": "string" diff --git a/storagetransfer/v1/storagetransfer-gen.go b/storagetransfer/v1/storagetransfer-gen.go index 612987d3859..dc5f0962c9e 100644 --- a/storagetransfer/v1/storagetransfer-gen.go +++ b/storagetransfer/v1/storagetransfer-gen.go @@ -820,6 +820,14 @@ type GcsData struct { // Name Requirements (/storage/docs/naming#requirements). BucketName string `json:"bucketName,omitempty"` + // ManagedFolderTransferEnabled: Transfer managed folders is in public + // preview. This option is only applicable to the Cloud Storage source + // bucket. If set to true: - The source managed folder will be + // transferred to the destination bucket - The destination managed + // folder will always be overwritten, other OVERWRITE options will not + // be supported + ManagedFolderTransferEnabled bool `json:"managedFolderTransferEnabled,omitempty"` + // Path: Root path to transfer objects. Must be an empty string or full // path name that ends with a '/'. This field is treated as an object // prefix. As such, it should generally not begin with a '/'. The root diff --git a/translate/v3/translate-api.json b/translate/v3/translate-api.json index 79c44987db8..b5e989f5b91 100644 --- a/translate/v3/translate-api.json +++ b/translate/v3/translate-api.json @@ -712,7 +712,7 @@ ], "parameters": { "name": { - "description": "Required. The resource name of the file to delete, in form of `projects/{project-number-or-id}/locations/{location_id}/adaptiveMtDatasets/{dataset}/files/{file}`", + "description": "Required. The resource name of the file to delete, in form of `projects/{project-number-or-id}/locations/{location_id}/adaptiveMtDatasets/{dataset}/adaptiveMtFiles/{file}`", "location": "path", "pattern": "^projects/[^/]+/locations/[^/]+/adaptiveMtDatasets/[^/]+/adaptiveMtFiles/[^/]+$", "required": true, @@ -738,7 +738,7 @@ ], "parameters": { "name": { - "description": "Required. The resource name of the file, in form of `projects/{project-number-or-id}/locations/{location_id}/adaptiveMtDatasets/{dataset}/files/{file}`", + "description": "Required. The resource name of the file, in form of `projects/{project-number-or-id}/locations/{location_id}/adaptiveMtDatasets/{dataset}/adaptiveMtFiles/{file}`", "location": "path", "pattern": "^projects/[^/]+/locations/[^/]+/adaptiveMtDatasets/[^/]+/adaptiveMtFiles/[^/]+$", "required": true, @@ -1706,7 +1706,7 @@ } } }, - "revision": "20231201", + "revision": "20240126", "rootUrl": "https://translation.googleapis.com/", "schemas": { "AdaptiveMtDataset": { @@ -1769,7 +1769,7 @@ "type": "integer" }, "name": { - "description": "Required. The resource name of the file, in form of `projects/{project-number-or-id}/locations/{location_id}/adaptiveMtDatasets/{dataset}/files/{file}`", + "description": "Required. The resource name of the file, in form of `projects/{project-number-or-id}/locations/{location_id}/adaptiveMtDatasets/{dataset}/adaptiveMtFiles/{file}`", "type": "string" }, "updateTime": { @@ -1792,7 +1792,7 @@ "type": "string" }, "name": { - "description": "Required. The resource name of the file, in form of `projects/{project-number-or-id}/locations/{location_id}/adaptiveMtDatasets/{dataset}/files/{file}/sentences/{sentence}`", + "description": "Required. The resource name of the file, in form of `projects/{project-number-or-id}/locations/{location_id}/adaptiveMtDatasets/{dataset}/adaptiveMtFiles/{file}/adaptiveMtSentences/{sentence}`", "type": "string" }, "sourceSentence": { diff --git a/translate/v3/translate-gen.go b/translate/v3/translate-gen.go index 11718accafc..67d8ef7ca09 100644 --- a/translate/v3/translate-gen.go +++ b/translate/v3/translate-gen.go @@ -375,7 +375,7 @@ type AdaptiveMtFile struct { // Name: Required. The resource name of the file, in form of // `projects/{project-number-or-id}/locations/{location_id}/adaptiveMtDat - // asets/{dataset}/files/{file}` + // asets/{dataset}/adaptiveMtFiles/{file}` Name string `json:"name,omitempty"` // UpdateTime: Output only. Timestamp when this file was last updated. @@ -415,7 +415,7 @@ type AdaptiveMtSentence struct { // Name: Required. The resource name of the file, in form of // `projects/{project-number-or-id}/locations/{location_id}/adaptiveMtDat - // asets/{dataset}/files/{file}/sentences/{sentence}` + // asets/{dataset}/adaptiveMtFiles/{file}/adaptiveMtSentences/{sentence}` Name string `json:"name,omitempty"` // SourceSentence: Required. The source sentence. @@ -6264,7 +6264,7 @@ type ProjectsLocationsAdaptiveMtDatasetsAdaptiveMtFilesDeleteCall struct { // // - name: The resource name of the file to delete, in form of // `projects/{project-number-or-id}/locations/{location_id}/adaptiveMtD -// atasets/{dataset}/files/{file}`. +// atasets/{dataset}/adaptiveMtFiles/{file}`. func (r *ProjectsLocationsAdaptiveMtDatasetsAdaptiveMtFilesService) Delete(name string) *ProjectsLocationsAdaptiveMtDatasetsAdaptiveMtFilesDeleteCall { c := &ProjectsLocationsAdaptiveMtDatasetsAdaptiveMtFilesDeleteCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.name = name @@ -6366,7 +6366,7 @@ func (c *ProjectsLocationsAdaptiveMtDatasetsAdaptiveMtFilesDeleteCall) Do(opts . // ], // "parameters": { // "name": { - // "description": "Required. The resource name of the file to delete, in form of `projects/{project-number-or-id}/locations/{location_id}/adaptiveMtDatasets/{dataset}/files/{file}`", + // "description": "Required. The resource name of the file to delete, in form of `projects/{project-number-or-id}/locations/{location_id}/adaptiveMtDatasets/{dataset}/adaptiveMtFiles/{file}`", // "location": "path", // "pattern": "^projects/[^/]+/locations/[^/]+/adaptiveMtDatasets/[^/]+/adaptiveMtFiles/[^/]+$", // "required": true, @@ -6400,7 +6400,7 @@ type ProjectsLocationsAdaptiveMtDatasetsAdaptiveMtFilesGetCall struct { // // - name: The resource name of the file, in form of // `projects/{project-number-or-id}/locations/{location_id}/adaptiveMtD -// atasets/{dataset}/files/{file}`. +// atasets/{dataset}/adaptiveMtFiles/{file}`. func (r *ProjectsLocationsAdaptiveMtDatasetsAdaptiveMtFilesService) Get(name string) *ProjectsLocationsAdaptiveMtDatasetsAdaptiveMtFilesGetCall { c := &ProjectsLocationsAdaptiveMtDatasetsAdaptiveMtFilesGetCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.name = name @@ -6515,7 +6515,7 @@ func (c *ProjectsLocationsAdaptiveMtDatasetsAdaptiveMtFilesGetCall) Do(opts ...g // ], // "parameters": { // "name": { - // "description": "Required. The resource name of the file, in form of `projects/{project-number-or-id}/locations/{location_id}/adaptiveMtDatasets/{dataset}/files/{file}`", + // "description": "Required. The resource name of the file, in form of `projects/{project-number-or-id}/locations/{location_id}/adaptiveMtDatasets/{dataset}/adaptiveMtFiles/{file}`", // "location": "path", // "pattern": "^projects/[^/]+/locations/[^/]+/adaptiveMtDatasets/[^/]+/adaptiveMtFiles/[^/]+$", // "required": true,