Skip to content
This repository was archived by the owner on Dec 31, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -9130,6 +9130,7 @@ async def sample_update_attribution_settings():
attribution_settings.acquisition_conversion_event_lookback_window = "ACQUISITION_CONVERSION_EVENT_LOOKBACK_WINDOW_30_DAYS"
attribution_settings.other_conversion_event_lookback_window = "OTHER_CONVERSION_EVENT_LOOKBACK_WINDOW_90_DAYS"
attribution_settings.reporting_attribution_model = "ADS_PREFERRED_LAST_CLICK"
attribution_settings.ads_web_conversion_data_export_scope = "ADS_PREFERRED"

request = admin_v1alpha.UpdateAttributionSettingsRequest(
attribution_settings=attribution_settings,
Expand Down Expand Up @@ -11751,9 +11752,9 @@ async def sample_get_enhanced_measurement_settings():

Returns:
google.analytics.admin_v1alpha.types.EnhancedMeasurementSettings:
Singleton resource under a
WebDataStream, configuring measurement
of additional site interactions and
Singleton resource under a web
DataStream, configuring measurement of
additional site interactions and
content.

"""
Expand Down Expand Up @@ -11875,9 +11876,9 @@ async def sample_update_enhanced_measurement_settings():

Returns:
google.analytics.admin_v1alpha.types.EnhancedMeasurementSettings:
Singleton resource under a
WebDataStream, configuring measurement
of additional site interactions and
Singleton resource under a web
DataStream, configuring measurement of
additional site interactions and
content.

"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9814,6 +9814,7 @@ def sample_update_attribution_settings():
attribution_settings.acquisition_conversion_event_lookback_window = "ACQUISITION_CONVERSION_EVENT_LOOKBACK_WINDOW_30_DAYS"
attribution_settings.other_conversion_event_lookback_window = "OTHER_CONVERSION_EVENT_LOOKBACK_WINDOW_90_DAYS"
attribution_settings.reporting_attribution_model = "ADS_PREFERRED_LAST_CLICK"
attribution_settings.ads_web_conversion_data_export_scope = "ADS_PREFERRED"

request = admin_v1alpha.UpdateAttributionSettingsRequest(
attribution_settings=attribution_settings,
Expand Down Expand Up @@ -12462,9 +12463,9 @@ def sample_get_enhanced_measurement_settings():

Returns:
google.analytics.admin_v1alpha.types.EnhancedMeasurementSettings:
Singleton resource under a
WebDataStream, configuring measurement
of additional site interactions and
Singleton resource under a web
DataStream, configuring measurement of
additional site interactions and
content.

"""
Expand Down Expand Up @@ -12590,9 +12591,9 @@ def sample_update_enhanced_measurement_settings():

Returns:
google.analytics.admin_v1alpha.types.EnhancedMeasurementSettings:
Singleton resource under a
WebDataStream, configuring measurement
of additional site interactions and
Singleton resource under a web
DataStream, configuring measurement of
additional site interactions and
content.

"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10158,9 +10158,9 @@ def __call__(

Returns:
~.resources.EnhancedMeasurementSettings:
Singleton resource under a
WebDataStream, configuring measurement
of additional site interactions and
Singleton resource under a web
DataStream, configuring measurement of
additional site interactions and
content.

"""
Expand Down Expand Up @@ -14422,9 +14422,9 @@ def __call__(

Returns:
~.resources.EnhancedMeasurementSettings:
Singleton resource under a
WebDataStream, configuring measurement
of additional site interactions and
Singleton resource under a web
DataStream, configuring measurement of
additional site interactions and
content.

"""
Expand Down
91 changes: 71 additions & 20 deletions google/analytics/admin_v1alpha/types/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -667,17 +667,15 @@ class WebStreamData(proto.Message):

Attributes:
measurement_id (str):
Output only. Analytics "Measurement ID",
without the "G-" prefix. Example: "G-1A2BCD345E"
would just be "1A2BCD345E".
Output only. Analytics Measurement ID.
Example: "G-1A2BCD345E".
firebase_app_id (str):
Output only. ID of the corresponding web app
in Firebase, if any. This ID can change if the
web app is deleted and recreated.
default_uri (str):
Immutable. Domain name of the web app being
measured, or empty. Example:
"http://www.google.com",
Domain name of the web app being measured, or
empty. Example: "http://www.google.com",
"https://www.google.com".
"""

Expand Down Expand Up @@ -2189,6 +2187,9 @@ class AttributionSettings(proto.Message):
will be reflected in reports with conversion and
revenue data. User and session data will be
unaffected.
ads_web_conversion_data_export_scope (google.analytics.admin_v1alpha.types.AttributionSettings.AdsWebConversionDataExportScope):
Required. The Conversion Export Scope for
data exported to linked Ads Accounts.
"""

class AcquisitionConversionEventLookbackWindow(proto.Enum):
Expand Down Expand Up @@ -2247,22 +2248,44 @@ class ReportingAttributionModel(proto.Enum):
the customer clicked through (or engaged view
through for YouTube) before converting.
CROSS_CHANNEL_FIRST_CLICK (3):
Gives all credit for the conversion to the
first channel that a customer clicked (or
engaged view through for YouTube) before
converting.
Starting in June 2023, new properties can no longer use this
model. See `Analytics
Help <https://support.google.com/analytics/answer/9164320?hl=en#040623>`__
for more details. Starting in September 2023, we will sunset
this model for all properties.

Gives all credit for the conversion to the first channel
that a customer clicked (or engaged view through for
YouTube) before converting.
CROSS_CHANNEL_LINEAR (4):
Distributes the credit for the conversion
equally across all the channels a customer
clicked (or engaged view through for YouTube)
before converting.
Starting in June 2023, new properties can no longer use this
model. See `Analytics
Help <https://support.google.com/analytics/answer/9164320?hl=en#040623>`__
for more details. Starting in September 2023, we will sunset
this model for all properties.

Distributes the credit for the conversion equally across all
the channels a customer clicked (or engaged view through for
YouTube) before converting.
CROSS_CHANNEL_POSITION_BASED (5):
Attributes 40% credit to the first and last
interaction, and the remaining 20% credit is
distributed evenly to the middle interactions.
Starting in June 2023, new properties can no longer use this
model. See `Analytics
Help <https://support.google.com/analytics/answer/9164320?hl=en#040623>`__
for more details. Starting in September 2023, we will sunset
this model for all properties.

Attributes 40% credit to the first and last interaction, and
the remaining 20% credit is distributed evenly to the middle
interactions.
CROSS_CHANNEL_TIME_DECAY (6):
Gives more credit to the touchpoints that
happened closer in time to the conversion.
Starting in June 2023, new properties can no longer use this
model. See `Analytics
Help <https://support.google.com/analytics/answer/9164320?hl=en#040623>`__
for more details. Starting in September 2023, we will sunset
this model for all properties.

Gives more credit to the touchpoints that happened closer in
time to the conversion.
ADS_PREFERRED_LAST_CLICK (7):
Attributes 100% of the conversion value to
the last Google Ads channel that the customer
Expand All @@ -2277,6 +2300,29 @@ class ReportingAttributionModel(proto.Enum):
CROSS_CHANNEL_TIME_DECAY = 6
ADS_PREFERRED_LAST_CLICK = 7

class AdsWebConversionDataExportScope(proto.Enum):
r"""The Conversion Export Scope for data exported to linked Ads
Accounts.

Values:
ADS_WEB_CONVERSION_DATA_EXPORT_SCOPE_UNSPECIFIED (0):
Default value. This value is unused.
NOT_SELECTED_YET (1):
No data export scope selected yet.
Export scope can never be changed back to this
value.
CROSS_CHANNEL (2):
The Ads Web Conversion Data export scope is
Cross Channel.
ADS_PREFERRED (3):
The Ads Web Conversion Data export scope is
Ads Preferred.
"""
ADS_WEB_CONVERSION_DATA_EXPORT_SCOPE_UNSPECIFIED = 0
NOT_SELECTED_YET = 1
CROSS_CHANNEL = 2
ADS_PREFERRED = 3

name: str = proto.Field(
proto.STRING,
number=1,
Expand All @@ -2298,6 +2344,11 @@ class ReportingAttributionModel(proto.Enum):
number=4,
enum=ReportingAttributionModel,
)
ads_web_conversion_data_export_scope: AdsWebConversionDataExportScope = proto.Field(
proto.ENUM,
number=5,
enum=AdsWebConversionDataExportScope,
)


class AccessBinding(proto.Message):
Expand Down Expand Up @@ -2429,7 +2480,7 @@ class BigQueryLink(proto.Message):


class EnhancedMeasurementSettings(proto.Message):
r"""Singleton resource under a WebDataStream, configuring
r"""Singleton resource under a web DataStream, configuring
measurement of additional site interactions and content.

Attributes:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ async def sample_update_attribution_settings():
attribution_settings.acquisition_conversion_event_lookback_window = "ACQUISITION_CONVERSION_EVENT_LOOKBACK_WINDOW_30_DAYS"
attribution_settings.other_conversion_event_lookback_window = "OTHER_CONVERSION_EVENT_LOOKBACK_WINDOW_90_DAYS"
attribution_settings.reporting_attribution_model = "ADS_PREFERRED_LAST_CLICK"
attribution_settings.ads_web_conversion_data_export_scope = "ADS_PREFERRED"

request = admin_v1alpha.UpdateAttributionSettingsRequest(
attribution_settings=attribution_settings,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ def sample_update_attribution_settings():
attribution_settings.acquisition_conversion_event_lookback_window = "ACQUISITION_CONVERSION_EVENT_LOOKBACK_WINDOW_30_DAYS"
attribution_settings.other_conversion_event_lookback_window = "OTHER_CONVERSION_EVENT_LOOKBACK_WINDOW_90_DAYS"
attribution_settings.reporting_attribution_model = "ADS_PREFERRED_LAST_CLICK"
attribution_settings.ads_web_conversion_data_export_scope = "ADS_PREFERRED"

request = admin_v1alpha.UpdateAttributionSettingsRequest(
attribution_settings=attribution_settings,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"language": "PYTHON",
"name": "google-analytics-admin",
"version": "0.17.0"
"version": "0.1.0"
},
"snippets": [
{
Expand Down Expand Up @@ -16787,12 +16787,12 @@
"regionTag": "analyticsadmin_v1alpha_generated_AnalyticsAdminService_UpdateAttributionSettings_async",
"segments": [
{
"end": 56,
"end": 57,
"start": 27,
"type": "FULL"
},
{
"end": 56,
"end": 57,
"start": 27,
"type": "SHORT"
},
Expand All @@ -16802,18 +16802,18 @@
"type": "CLIENT_INITIALIZATION"
},
{
"end": 50,
"end": 51,
"start": 41,
"type": "REQUEST_INITIALIZATION"
},
{
"end": 53,
"start": 51,
"end": 54,
"start": 52,
"type": "REQUEST_EXECUTION"
},
{
"end": 57,
"start": 54,
"end": 58,
"start": 55,
"type": "RESPONSE_HANDLING"
}
],
Expand Down Expand Up @@ -16871,12 +16871,12 @@
"regionTag": "analyticsadmin_v1alpha_generated_AnalyticsAdminService_UpdateAttributionSettings_sync",
"segments": [
{
"end": 56,
"end": 57,
"start": 27,
"type": "FULL"
},
{
"end": 56,
"end": 57,
"start": 27,
"type": "SHORT"
},
Expand All @@ -16886,18 +16886,18 @@
"type": "CLIENT_INITIALIZATION"
},
{
"end": 50,
"end": 51,
"start": 41,
"type": "REQUEST_INITIALIZATION"
},
{
"end": 53,
"start": 51,
"end": 54,
"start": 52,
"type": "REQUEST_EXECUTION"
},
{
"end": 57,
"start": 54,
"end": 58,
"start": 55,
"type": "RESPONSE_HANDLING"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"language": "PYTHON",
"name": "google-analytics-admin",
"version": "0.17.0"
"version": "0.1.0"
},
"snippets": [
{
Expand Down
Loading