Skip to content

Commit e89d3b2

Browse files
gcf-owl-bot[bot]vchudnov-g
gcf-owl-bot[bot]
and
vchudnov-g
authored
feat: [google-shopping-merchant-datasources] New field product_review_data_source added in message .google.shopping.merchant.datasources.v1beta.DataSource to specify the datasource of the product review (googleapis#13413)
- [ ] Regenerate this pull request now. BEGIN_COMMIT_OVERRIDE feat: New field product_review_data_source added in message google.shopping.merchant.datasources.v1beta.DataSource to feat: New field `merchant_review_data_source` added in message `.google.shopping.merchant.datasources.v1beta.DataSource` to specify the datasource of the merchant review feat: A new message `ProductReviewDataSource` is added to specify the datasource of the product review feat: A new message `MerchantReviewDataSource` is added to specify the datasource of the merchant review docs: A comment for field `take_from_data_sources` in message `.google.shopping.merchant.datasources.v1beta.PrimaryProductDataSource` is changed docs: A comment for message `SupplementalProductDataSource` is changed docs: A comment for field `feed_label` in message `.google.shopping.merchant.datasources.v1beta.SupplementalProductDataSource` is changed docs: A comment for field `username` in message `.google.shopping.merchant.datasources.v1beta.FileInput` is changed docs: A comment for field `password` in message `.google.shopping.merchant.datasources.v1beta.FileInput` is changed docs: A comment for enum value `FETCH` in enum `FileInputType` is changed docs: A comment for enum value `GOOGLE_SHEETS` in enum `FileInputType` is changed END_COMMIT_OVERRIDE feat: New field `merchant_review_data_source` added in message `.google.shopping.merchant.datasources.v1beta.DataSource` to specify the datasource of the merchant review feat: A new message `ProductReviewDataSource` is added to specify the datasource of the product review feat: A new message `MerchantReviewDataSource` is added to specify the datasource of the merchant review docs: A comment for field `take_from_data_sources` in message `.google.shopping.merchant.datasources.v1beta.PrimaryProductDataSource` is changed docs: A comment for message `SupplementalProductDataSource` is changed docs: A comment for field `feed_label` in message `.google.shopping.merchant.datasources.v1beta.SupplementalProductDataSource` is changed docs: A comment for field `username` in message `.google.shopping.merchant.datasources.v1beta.FileInput` is changed docs: A comment for field `password` in message `.google.shopping.merchant.datasources.v1beta.FileInput` is changed docs: A comment for enum value `FETCH` in enum `FileInputType` is changed docs: A comment for enum value `GOOGLE_SHEETS` in enum `FileInputType` is changed PiperOrigin-RevId: 713234506 Source-Link: googleapis/googleapis@51b9a3d Source-Link: https://github.com/googleapis/googleapis-gen/commit/6b4a55f0f4ff244db888e4c45a5ece5634632cb0 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLXNob3BwaW5nLW1lcmNoYW50LWRhdGFzb3VyY2VzLy5Pd2xCb3QueWFtbCIsImgiOiI2YjRhNTVmMGY0ZmYyNDRkYjg4OGU0YzQ1YTVlY2U1NjM0NjMyY2IwIn0= --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Victor Chudnovsky <[email protected]>
1 parent 9f278d6 commit e89d3b2

File tree

10 files changed

+73
-25
lines changed

10 files changed

+73
-25
lines changed

‎packages/google-shopping-merchant-datasources/google/shopping/merchant_datasources/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@
4343
from google.shopping.merchant_datasources_v1beta.types.datasourcetypes import (
4444
DataSourceReference,
4545
LocalInventoryDataSource,
46+
MerchantReviewDataSource,
4647
PrimaryProductDataSource,
48+
ProductReviewDataSource,
4749
PromotionDataSource,
4850
RegionalInventoryDataSource,
4951
SupplementalProductDataSource,
@@ -69,7 +71,9 @@
6971
"UpdateDataSourceRequest",
7072
"DataSourceReference",
7173
"LocalInventoryDataSource",
74+
"MerchantReviewDataSource",
7275
"PrimaryProductDataSource",
76+
"ProductReviewDataSource",
7377
"PromotionDataSource",
7478
"RegionalInventoryDataSource",
7579
"SupplementalProductDataSource",

‎packages/google-shopping-merchant-datasources/google/shopping/merchant_datasources/gapic_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
__version__ = "0.1.6" # {x-release-please-version}
16+
__version__ = "0.0.0" # {x-release-please-version}

‎packages/google-shopping-merchant-datasources/google/shopping/merchant_datasources_v1beta/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
from .types.datasourcetypes import (
4040
DataSourceReference,
4141
LocalInventoryDataSource,
42+
MerchantReviewDataSource,
4243
PrimaryProductDataSource,
44+
ProductReviewDataSource,
4345
PromotionDataSource,
4446
RegionalInventoryDataSource,
4547
SupplementalProductDataSource,
@@ -64,7 +66,9 @@
6466
"ListDataSourcesRequest",
6567
"ListDataSourcesResponse",
6668
"LocalInventoryDataSource",
69+
"MerchantReviewDataSource",
6770
"PrimaryProductDataSource",
71+
"ProductReviewDataSource",
6872
"PromotionDataSource",
6973
"RegionalInventoryDataSource",
7074
"SupplementalProductDataSource",

‎packages/google-shopping-merchant-datasources/google/shopping/merchant_datasources_v1beta/gapic_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
__version__ = "0.1.6" # {x-release-please-version}
16+
__version__ = "0.0.0" # {x-release-please-version}

‎packages/google-shopping-merchant-datasources/google/shopping/merchant_datasources_v1beta/types/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
from .datasourcetypes import (
2727
DataSourceReference,
2828
LocalInventoryDataSource,
29+
MerchantReviewDataSource,
2930
PrimaryProductDataSource,
31+
ProductReviewDataSource,
3032
PromotionDataSource,
3133
RegionalInventoryDataSource,
3234
SupplementalProductDataSource,
@@ -45,7 +47,9 @@
4547
"UpdateDataSourceRequest",
4648
"DataSourceReference",
4749
"LocalInventoryDataSource",
50+
"MerchantReviewDataSource",
4851
"PrimaryProductDataSource",
52+
"ProductReviewDataSource",
4953
"PromotionDataSource",
5054
"RegionalInventoryDataSource",
5155
"SupplementalProductDataSource",

‎packages/google-shopping-merchant-datasources/google/shopping/merchant_datasources_v1beta/types/datasources.py‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,34 +54,46 @@ class DataSource(proto.Message):
5454
5555
Attributes:
5656
primary_product_data_source (google.shopping.merchant_datasources_v1beta.types.PrimaryProductDataSource):
57-
Required. The `primary data
57+
The `primary data
5858
source <https://support.google.com/merchants/answer/7439058>`__
5959
for local and online products.
6060
6161
This field is a member of `oneof`_ ``Type``.
6262
supplemental_product_data_source (google.shopping.merchant_datasources_v1beta.types.SupplementalProductDataSource):
63-
Required. The `supplemental data
63+
The `supplemental data
6464
source <https://support.google.com/merchants/answer/7439058>`__
6565
for local and online products.
6666
6767
This field is a member of `oneof`_ ``Type``.
6868
local_inventory_data_source (google.shopping.merchant_datasources_v1beta.types.LocalInventoryDataSource):
69-
Required. The `local
69+
The `local
7070
inventory <https://support.google.com/merchants/answer/7023001>`__
7171
data source.
7272
7373
This field is a member of `oneof`_ ``Type``.
7474
regional_inventory_data_source (google.shopping.merchant_datasources_v1beta.types.RegionalInventoryDataSource):
75-
Required. The `regional
75+
The `regional
7676
inventory <https://support.google.com/merchants/answer/7439058>`__
7777
data source.
7878
7979
This field is a member of `oneof`_ ``Type``.
8080
promotion_data_source (google.shopping.merchant_datasources_v1beta.types.PromotionDataSource):
81-
Required. The
81+
The
8282
`promotion <https://support.google.com/merchants/answer/2906014>`__
8383
data source.
8484
85+
This field is a member of `oneof`_ ``Type``.
86+
product_review_data_source (google.shopping.merchant_datasources_v1beta.types.ProductReviewDataSource):
87+
The `product
88+
review <https://support.google.com/merchants/answer/7045996>`__
89+
data source.
90+
91+
This field is a member of `oneof`_ ``Type``.
92+
merchant_review_data_source (google.shopping.merchant_datasources_v1beta.types.MerchantReviewDataSource):
93+
The `merchant
94+
review <https://support.google.com/merchants/answer/7045996>`__
95+
data source.
96+
8597
This field is a member of `oneof`_ ``Type``.
8698
name (str):
8799
Identifier. The name of the data source. Format:
@@ -170,6 +182,18 @@ class Input(proto.Enum):
170182
oneof="Type",
171183
message=datasourcetypes.PromotionDataSource,
172184
)
185+
product_review_data_source: datasourcetypes.ProductReviewDataSource = proto.Field(
186+
proto.MESSAGE,
187+
number=9,
188+
oneof="Type",
189+
message=datasourcetypes.ProductReviewDataSource,
190+
)
191+
merchant_review_data_source: datasourcetypes.MerchantReviewDataSource = proto.Field(
192+
proto.MESSAGE,
193+
number=12,
194+
oneof="Type",
195+
message=datasourcetypes.MerchantReviewDataSource,
196+
)
173197
name: str = proto.Field(
174198
proto.STRING,
175199
number=1,

‎packages/google-shopping-merchant-datasources/google/shopping/merchant_datasources_v1beta/types/datasourcetypes.py‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
"LocalInventoryDataSource",
2828
"RegionalInventoryDataSource",
2929
"PromotionDataSource",
30+
"ProductReviewDataSource",
31+
"MerchantReviewDataSource",
3032
"DataSourceReference",
3133
},
3234
)
@@ -123,10 +125,7 @@ class DefaultRule(proto.Message):
123125
a new reference to this list (in sequential order).
124126
125127
To unlink the data source from the default rule, you need to
126-
remove the given reference from this list. To create
127-
attribute rules that are different from the default rule,
128-
see `Set up your attribute
129-
rules <//support.google.com/merchants/answer/14994083>`__.
128+
remove the given reference from this list.
130129
131130
Changing the order of this list will result in changing the
132131
priority of data sources in the default rule.
@@ -173,12 +172,9 @@ class DefaultRule(proto.Message):
173172

174173
class SupplementalProductDataSource(proto.Message):
175174
r"""The supplemental data source for local and online products.
176-
Supplemental API data sources must not have ``feedLabel`` and
177-
``contentLanguage`` fields set. You can only use supplemental data
178-
sources to update existing products. For information about creating
179-
a supplemental data source, see `Create a supplemental data source
180-
and link it to the primary data
181-
source </merchant/api/guides/data-sources/overview#create-supplemental-data-source>`__.
175+
After creation, you should make sure to link the supplemental
176+
product data source into one or more primary product data
177+
sources.
182178
183179
184180
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
@@ -196,7 +192,11 @@ class SupplementalProductDataSource(proto.Message):
196192
197193
``feedLabel`` and ``contentLanguage`` must be either both
198194
set or unset for data sources with product content type.
199-
They must be set for data sources with a file input.
195+
196+
They must be set for data sources with a [file
197+
input][google.shopping.merchant.datasources.v1main.FileInput].
198+
The fields must be unset for data sources without [file
199+
input][google.shopping.merchant.datasources.v1main.FileInput].
200200
201201
If set, the data source will only accept products matching
202202
this combination. If unset, the data source will accept
@@ -327,6 +327,14 @@ class PromotionDataSource(proto.Message):
327327
)
328328

329329

330+
class ProductReviewDataSource(proto.Message):
331+
r"""The product review data source."""
332+
333+
334+
class MerchantReviewDataSource(proto.Message):
335+
r"""The merchant review data source."""
336+
337+
330338
class DataSourceReference(proto.Message):
331339
r"""Data source reference can be used to manage related data
332340
sources within the data source service.

‎packages/google-shopping-merchant-datasources/google/shopping/merchant_datasources_v1beta/types/fileinputs.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ class FileInputType(proto.Enum):
5858
Center.
5959
FETCH (2):
6060
The file is fetched from the configured
61-
[fetch_uri][google.shopping.content.bundles.DataSources.FileInput.FetchSettings.fetch_uri].
61+
[fetch_uri][google.shopping.merchant.datasources.v1beta.FileInput.FetchSettings.fetch_uri].
6262
GOOGLE_SHEETS (3):
6363
The file is fetched from Google Sheets specified in the
64-
[fetch_uri][google.shopping.content.bundles.DataSources.FileInput.FetchSettings.fetch_uri].
64+
[fetch_uri][google.shopping.merchant.datasources.v1beta.FileInput.FetchSettings.fetch_uri].
6565
"""
6666
FILE_INPUT_TYPE_UNSPECIFIED = 0
6767
UPLOAD = 1
@@ -102,13 +102,13 @@ class FetchSettings(proto.Message):
102102
to be a valid link using one of those three
103103
protocols. Immutable for Google Sheets files.
104104
username (str):
105-
Optional. An optional user name for [fetch
106-
url][google.shopping.content.bundles.DataSources.FileInput.fetch_url].
105+
Optional. An optional user name for
106+
[fetch_uri][google.shopping.merchant.datasources.v1beta.FileInput.FetchSettings.fetch_uri].
107107
Used for `submitting data sources through
108108
SFTP <https://support.google.com/merchants/answer/13813117>`__.
109109
password (str):
110-
Optional. An optional password for [fetch
111-
url][google.shopping.content.bundles.DataSources.FileInput.fetch_url].
110+
Optional. An optional password for
111+
[fetch_uri][google.shopping.merchant.datasources.v1beta.FileInput.FetchSettings.fetch_uri].
112112
Used for `submitting data sources through
113113
SFTP <https://support.google.com/merchants/answer/13813117>`__.
114114
"""

‎packages/google-shopping-merchant-datasources/samples/generated_samples/snippet_metadata_google.shopping.merchant.datasources.v1beta.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
],
99
"language": "PYTHON",
1010
"name": "google-shopping-merchant-datasources",
11-
"version": "0.1.6"
11+
"version": "0.1.0"
1212
},
1313
"snippets": [
1414
{

‎packages/google-shopping-merchant-datasources/tests/unit/gapic/merchant_datasources_v1beta/test_data_sources_service.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5223,6 +5223,8 @@ def test_create_data_source_rest_call_success(request_type):
52235223
"target_country": "target_country_value",
52245224
"content_language": "content_language_value",
52255225
},
5226+
"product_review_data_source": {},
5227+
"merchant_review_data_source": {},
52265228
"name": "name_value",
52275229
"data_source_id": 1462,
52285230
"display_name": "display_name_value",
@@ -5476,6 +5478,8 @@ def test_update_data_source_rest_call_success(request_type):
54765478
"target_country": "target_country_value",
54775479
"content_language": "content_language_value",
54785480
},
5481+
"product_review_data_source": {},
5482+
"merchant_review_data_source": {},
54795483
"name": "accounts/sample1/dataSources/sample2",
54805484
"data_source_id": 1462,
54815485
"display_name": "display_name_value",

0 commit comments

Comments
 (0)