Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Add feature flags and epsilon greedy bandit for Brave Ads #7484

Merged
merged 1 commit into from
Jan 5, 2021
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
3 changes: 3 additions & 0 deletions components/brave_ads/browser/ads_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ void AdsService::RegisterProfilePrefs(
ads::prefs::kCatalogPing, 0);
registry->RegisterInt64Pref(
ads::prefs::kCatalogLastUpdated, 0);

registry->RegisterStringPref(
ads::prefs::kEpsilonGreedyBanditArms, "");
}

} // namespace brave_ads
18 changes: 12 additions & 6 deletions components/brave_ads/test/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@ source_set("brave_ads_unit_tests") {
"//brave/vendor/bat-native-ads/src/bat/ads/internal/account/ad_rewards/payments/payments_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/account/statement/statement_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ad_pacing/ad_notifications/ad_notification_pacing_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_targeting/models/purchase_intent/purchase_intent_model_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_targeting/models/text_classification/text_classification_model_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_targeting/models/behavioral/bandits/epsilon_greedy_bandit_model_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_targeting/models/behavioral/purchase_intent/purchase_intent_model_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_targeting/models/contextual/text_classification/text_classification_model_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ad_targeting/ad_targeting_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ad_targeting/ad_targeting_util_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ad_targeting/processors/purchase_intent/purchase_intent_processor_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ad_targeting/processors/text_classification/text_classification_processor_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ad_targeting/resources/purchase_intent/purchase_intent_resource_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ad_targeting/resources/text_classification/text_classification_resource_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ad_targeting/processors/behavioral/bandits/epsilon_greedy_bandit_processor_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ad_targeting/processors/behavioral/purchase_intent/purchase_intent_processor_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ad_targeting/processors/contextual/text_classification/text_classification_processor_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ad_targeting/resources/behavioral/purchase_intent/purchase_intent_resource_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ad_targeting/resources/contextual/text_classification/text_classification_resource_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ad_transfer/ad_transfer_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_client_mock.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_client_mock.h",
Expand All @@ -41,6 +44,9 @@ source_set("brave_ads_unit_tests") {
"//brave/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_new_tab_page_ads_database_table_test.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_new_tab_page_ads_database_table_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/ad_notifications/eligible_ad_notifications_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/features/bandits/epsilon_greedy_bandit_features_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/features/purchase_intent/purchase_intent_features_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/features/text_classification/text_classification_features_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/conversion_frequency_cap_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/daily_cap_frequency_cap_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/daypart_frequency_cap_unittest.cc",
Expand Down
94 changes: 56 additions & 38 deletions vendor/bat-native-ads/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -169,51 +169,63 @@ source_set("ads") {
"src/bat/ads/internal/ad_server/get_catalog_url_request_builder.h",
"src/bat/ads/internal/ad_serving/ad_notifications/ad_notification_serving.cc",
"src/bat/ads/internal/ad_serving/ad_notifications/ad_notification_serving.h",
"src/bat/ads/internal/ad_serving/ad_targeting/geographic/subdivision/get_subdivision_url_request_builder.cc",
"src/bat/ads/internal/ad_serving/ad_targeting/geographic/subdivision/get_subdivision_url_request_builder.h",
"src/bat/ads/internal/ad_serving/ad_targeting/geographic/subdivision/subdivision_targeting.cc",
"src/bat/ads/internal/ad_serving/ad_targeting/geographic/subdivision/subdivision_targeting.h",
"src/bat/ads/internal/ad_serving/ad_targeting/models/behavioral/bandits/epsilon_greedy_bandit_model_values.h",
"src/bat/ads/internal/ad_serving/ad_targeting/models/behavioral/bandits/epsilon_greedy_bandit_model.cc",
"src/bat/ads/internal/ad_serving/ad_targeting/models/behavioral/bandits/epsilon_greedy_bandit_model.h",
"src/bat/ads/internal/ad_serving/ad_targeting/models/behavioral/purchase_intent/purchase_intent_model_values.h",
"src/bat/ads/internal/ad_serving/ad_targeting/models/behavioral/purchase_intent/purchase_intent_model.cc",
"src/bat/ads/internal/ad_serving/ad_targeting/models/behavioral/purchase_intent/purchase_intent_model.h",
"src/bat/ads/internal/ad_serving/ad_targeting/models/contextual/text_classification/text_classification_model.cc",
"src/bat/ads/internal/ad_serving/ad_targeting/models/contextual/text_classification/text_classification_model.h",
"src/bat/ads/internal/ad_serving/ad_targeting/models/model.h",
"src/bat/ads/internal/ad_serving/ad_targeting/models/purchase_intent/purchase_intent_model.cc",
"src/bat/ads/internal/ad_serving/ad_targeting/models/purchase_intent/purchase_intent_model.h",
"src/bat/ads/internal/ad_serving/ad_targeting/models/purchase_intent/purchase_intent_model_values.h",
"src/bat/ads/internal/ad_serving/ad_targeting/models/text_classification/text_classification_model.cc",
"src/bat/ads/internal/ad_serving/ad_targeting/models/text_classification/text_classification_model.h",
"src/bat/ads/internal/ad_targeting/ad_targeting.cc",
"src/bat/ads/internal/ad_targeting/ad_targeting.h",
"src/bat/ads/internal/ad_targeting/ad_targeting_aliases.h",
"src/bat/ads/internal/ad_targeting/ad_targeting_util.cc",
"src/bat/ads/internal/ad_targeting/ad_targeting_util.h",
"src/bat/ads/internal/ad_targeting/ad_targeting_values.h",
"src/bat/ads/internal/ad_targeting/data_types/purchase_intent/purchase_intent_aliases.h",
"src/bat/ads/internal/ad_targeting/data_types/purchase_intent/purchase_intent_components.h",
"src/bat/ads/internal/ad_targeting/data_types/purchase_intent/purchase_intent_country_codes.h",
"src/bat/ads/internal/ad_targeting/data_types/purchase_intent/purchase_intent_funnel_keyword_info.cc",
"src/bat/ads/internal/ad_targeting/data_types/purchase_intent/purchase_intent_funnel_keyword_info.h",
"src/bat/ads/internal/ad_targeting/data_types/purchase_intent/purchase_intent_info.cc",
"src/bat/ads/internal/ad_targeting/data_types/purchase_intent/purchase_intent_info.h",
"src/bat/ads/internal/ad_targeting/data_types/purchase_intent/purchase_intent_segment_keyword_info.cc",
"src/bat/ads/internal/ad_targeting/data_types/purchase_intent/purchase_intent_segment_keyword_info.h",
"src/bat/ads/internal/ad_targeting/data_types/purchase_intent/purchase_intent_signal_history_info.cc",
"src/bat/ads/internal/ad_targeting/data_types/purchase_intent/purchase_intent_signal_history_info.h",
"src/bat/ads/internal/ad_targeting/data_types/purchase_intent/purchase_intent_signal_info.cc",
"src/bat/ads/internal/ad_targeting/data_types/purchase_intent/purchase_intent_signal_info.h",
"src/bat/ads/internal/ad_targeting/data_types/purchase_intent/purchase_intent_site_info.cc",
"src/bat/ads/internal/ad_targeting/data_types/purchase_intent/purchase_intent_site_info.h",
"src/bat/ads/internal/ad_targeting/data_types/text_classification/text_classification_aliases.h",
"src/bat/ads/internal/ad_targeting/data_types/text_classification/text_classification_components.h",
"src/bat/ads/internal/ad_targeting/data_types/text_classification/text_classification_language_codes.h",
"src/bat/ads/internal/ad_targeting/geographic/subdivision/get_subdivision_url_request_builder.cc",
"src/bat/ads/internal/ad_targeting/geographic/subdivision/get_subdivision_url_request_builder.h",
"src/bat/ads/internal/ad_targeting/geographic/subdivision/subdivision_targeting.cc",
"src/bat/ads/internal/ad_targeting/geographic/subdivision/subdivision_targeting.h",
"src/bat/ads/internal/ad_targeting/ad_targeting.cc",
"src/bat/ads/internal/ad_targeting/ad_targeting.h",
"src/bat/ads/internal/ad_targeting/data_types/behavioral/bandits/epsilon_greedy_bandit_arm_info.cc",
"src/bat/ads/internal/ad_targeting/data_types/behavioral/bandits/epsilon_greedy_bandit_arm_info.h",
"src/bat/ads/internal/ad_targeting/data_types/behavioral/bandits/epsilon_greedy_bandit_arms.cc",
"src/bat/ads/internal/ad_targeting/data_types/behavioral/bandits/epsilon_greedy_bandit_arms.h",
"src/bat/ads/internal/ad_targeting/data_types/behavioral/purchase_intent/purchase_intent_aliases.h",
"src/bat/ads/internal/ad_targeting/data_types/behavioral/purchase_intent/purchase_intent_components.h",
"src/bat/ads/internal/ad_targeting/data_types/behavioral/purchase_intent/purchase_intent_country_codes.h",
"src/bat/ads/internal/ad_targeting/data_types/behavioral/purchase_intent/purchase_intent_funnel_keyword_info.cc",
"src/bat/ads/internal/ad_targeting/data_types/behavioral/purchase_intent/purchase_intent_funnel_keyword_info.h",
"src/bat/ads/internal/ad_targeting/data_types/behavioral/purchase_intent/purchase_intent_info.cc",
"src/bat/ads/internal/ad_targeting/data_types/behavioral/purchase_intent/purchase_intent_info.h",
"src/bat/ads/internal/ad_targeting/data_types/behavioral/purchase_intent/purchase_intent_segment_keyword_info.cc",
"src/bat/ads/internal/ad_targeting/data_types/behavioral/purchase_intent/purchase_intent_segment_keyword_info.h",
"src/bat/ads/internal/ad_targeting/data_types/behavioral/purchase_intent/purchase_intent_signal_history_info.cc",
"src/bat/ads/internal/ad_targeting/data_types/behavioral/purchase_intent/purchase_intent_signal_history_info.h",
"src/bat/ads/internal/ad_targeting/data_types/behavioral/purchase_intent/purchase_intent_signal_info.cc",
"src/bat/ads/internal/ad_targeting/data_types/behavioral/purchase_intent/purchase_intent_signal_info.h",
"src/bat/ads/internal/ad_targeting/data_types/behavioral/purchase_intent/purchase_intent_site_info.cc",
"src/bat/ads/internal/ad_targeting/data_types/behavioral/purchase_intent/purchase_intent_site_info.h",
"src/bat/ads/internal/ad_targeting/data_types/contextual/text_classification/text_classification_aliases.h",
"src/bat/ads/internal/ad_targeting/data_types/contextual/text_classification/text_classification_components.h",
"src/bat/ads/internal/ad_targeting/data_types/contextual/text_classification/text_classification_language_codes.h",
"src/bat/ads/internal/ad_targeting/processors/behavioral/bandits/bandit_feedback_info.h",
"src/bat/ads/internal/ad_targeting/processors/behavioral/bandits/epsilon_greedy_bandit_processor.cc",
"src/bat/ads/internal/ad_targeting/processors/behavioral/bandits/epsilon_greedy_bandit_processor.h",
"src/bat/ads/internal/ad_targeting/processors/behavioral/purchase_intent/purchase_intent_processor_values.h",
"src/bat/ads/internal/ad_targeting/processors/behavioral/purchase_intent/purchase_intent_processor.cc",
"src/bat/ads/internal/ad_targeting/processors/behavioral/purchase_intent/purchase_intent_processor.h",
"src/bat/ads/internal/ad_targeting/processors/contextual/text_classification/text_classification_processor_values.h",
"src/bat/ads/internal/ad_targeting/processors/contextual/text_classification/text_classification_processor.cc",
"src/bat/ads/internal/ad_targeting/processors/contextual/text_classification/text_classification_processor.h",
"src/bat/ads/internal/ad_targeting/processors/processor.h",
"src/bat/ads/internal/ad_targeting/processors/purchase_intent/purchase_intent_processor.cc",
"src/bat/ads/internal/ad_targeting/processors/purchase_intent/purchase_intent_processor.h",
"src/bat/ads/internal/ad_targeting/processors/purchase_intent/purchase_intent_processor_values.h",
"src/bat/ads/internal/ad_targeting/processors/text_classification/text_classification_processor.cc",
"src/bat/ads/internal/ad_targeting/processors/text_classification/text_classification_processor.h",
"src/bat/ads/internal/ad_targeting/resources/purchase_intent/purchase_intent_resource.cc",
"src/bat/ads/internal/ad_targeting/resources/purchase_intent/purchase_intent_resource.h",
"src/bat/ads/internal/ad_targeting/resources/behavioral/bandits/epsilon_greedy_bandit_resource.h",
"src/bat/ads/internal/ad_targeting/resources/behavioral/purchase_intent/purchase_intent_resource.cc",
"src/bat/ads/internal/ad_targeting/resources/behavioral/purchase_intent/purchase_intent_resource.h",
"src/bat/ads/internal/ad_targeting/resources/contextual/text_classification/text_classification_resource.cc",
"src/bat/ads/internal/ad_targeting/resources/contextual/text_classification/text_classification_resource.h",
"src/bat/ads/internal/ad_targeting/resources/resource.h",
"src/bat/ads/internal/ad_targeting/resources/text_classification/text_classification_resource.cc",
"src/bat/ads/internal/ad_targeting/resources/text_classification/text_classification_resource.h",
"src/bat/ads/internal/ad_transfer/ad_transfer.cc",
"src/bat/ads/internal/ad_transfer/ad_transfer.h",
"src/bat/ads/internal/ads/ad_notifications/ad_notification.cc",
Expand Down Expand Up @@ -350,8 +362,14 @@ source_set("ads") {
"src/bat/ads/internal/eligible_ads/ad_notifications/filters/eligible_ads_priority_filter.cc",
"src/bat/ads/internal/eligible_ads/ad_notifications/filters/eligible_ads_priority_filter.h",
"src/bat/ads/internal/eligible_ads/eligible_ads_util.h",
"src/bat/ads/internal/features/bandits/epsilon_greedy_bandit_features.cc",
"src/bat/ads/internal/features/bandits/epsilon_greedy_bandit_features.h",
"src/bat/ads/internal/features/features.cc",
"src/bat/ads/internal/features/features.h",
"src/bat/ads/internal/features/purchase_intent/purchase_intent_features.cc",
"src/bat/ads/internal/features/purchase_intent/purchase_intent_features.h",
"src/bat/ads/internal/features/text_classification/text_classification_features.cc",
"src/bat/ads/internal/features/text_classification/text_classification_features.h",
"src/bat/ads/internal/frequency_capping/ad_notifications/ad_notifications_frequency_capping.cc",
"src/bat/ads/internal/frequency_capping/ad_notifications/ad_notifications_frequency_capping.h",
"src/bat/ads/internal/frequency_capping/exclusion_rules/conversion_frequency_cap.cc",
Expand Down
2 changes: 2 additions & 0 deletions vendor/bat-native-ads/include/bat/ads/pref_names.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ extern const char kCatalogVersion[];
extern const char kCatalogPing[];
extern const char kCatalogLastUpdated[];

extern const char kEpsilonGreedyBanditArms[];

} // namespace prefs

} // namespace ads
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

#include "bat/ads/internal/ad_serving/ad_notifications/ad_notification_serving.h"
#include "bat/ads/internal/ad_serving/ad_targeting/geographic/subdivision/subdivision_targeting.h"
#include "bat/ads/internal/ad_targeting/ad_targeting.h"
#include "bat/ads/internal/ad_targeting/geographic/subdivision/subdivision_targeting.h"
#include "bat/ads/internal/unittest_base.h"
#include "bat/ads/internal/unittest_util.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
#include "bat/ads/ad_notification_info.h"
#include "bat/ads/internal/ad_delivery/ad_notifications/ad_notification_delivery.h"
#include "bat/ads/internal/ad_pacing/ad_notifications/ad_notification_pacing.h"
#include "bat/ads/internal/ad_serving/ad_targeting/models/text_classification/text_classification_model.h"
#include "bat/ads/internal/ad_serving/ad_targeting/geographic/subdivision/subdivision_targeting.h"
#include "bat/ads/internal/ad_serving/ad_targeting/models/contextual/text_classification/text_classification_model.h"
#include "bat/ads/internal/ad_targeting/ad_targeting_util.h"
#include "bat/ads/internal/ad_targeting/ad_targeting_values.h"
#include "bat/ads/internal/ad_targeting/geographic/subdivision/subdivision_targeting.h"
#include "bat/ads/internal/ads_client_helper.h"
#include "bat/ads/internal/client/client.h"
#include "bat/ads/internal/database/tables/ad_events_database_table.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */

#include "bat/ads/internal/ad_targeting/geographic/subdivision/get_subdivision_url_request_builder.h"
#include "bat/ads/internal/ad_serving/ad_targeting/geographic/subdivision/get_subdivision_url_request_builder.h"

#include "base/strings/stringprintf.h"
#include "bat/ads/internal/server/ads_serve_server_util.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */

#ifndef BAT_ADS_INTERNAL_AD_TARGETING_GEOGRAPHIC_SUBDIVISION_GET_SUBDIVISION_URL_REQUEST_BUILDER_H_ // NOLINT
#define BAT_ADS_INTERNAL_AD_TARGETING_GEOGRAPHIC_SUBDIVISION_GET_SUBDIVISION_URL_REQUEST_BUILDER_H_ // NOLINT
#ifndef BAT_ADS_INTERNAL_AD_SERVING_AD_TARGETING_GEOGRAPHIC_SUBDIVISION_GET_SUBDIVISION_URL_REQUEST_BUILDER_H_ // NOLINT
#define BAT_ADS_INTERNAL_AD_SERVING_AD_TARGETING_GEOGRAPHIC_SUBDIVISION_GET_SUBDIVISION_URL_REQUEST_BUILDER_H_ // NOLINT

#include <string>

Expand All @@ -30,4 +30,4 @@ class GetSubdivisionUrlRequestBuilder : UrlRequestBuilder {
} // namespace ad_targeting
} // namespace ads

#endif // BAT_ADS_INTERNAL_AD_TARGETING_GEOGRAPHIC_SUBDIVISION_GET_SUBDIVISION_URL_REQUEST_BUILDER_H_ // NOLINT
#endif // BAT_ADS_INTERNAL_AD_SERVING_AD_TARGETING_GEOGRAPHIC_SUBDIVISION_GET_SUBDIVISION_URL_REQUEST_BUILDER_H_ // NOLINT
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */

#include "bat/ads/internal/ad_targeting/geographic/subdivision/subdivision_targeting.h"
#include "bat/ads/internal/ad_serving/ad_targeting/geographic/subdivision/subdivision_targeting.h"

#include <stdint.h>

Expand All @@ -17,7 +17,7 @@
#include "brave/components/l10n/common/locale_util.h"
#include "bat/ads/ads.h"
#include "bat/ads/ads_client.h"
#include "bat/ads/internal/ad_targeting/geographic/subdivision/get_subdivision_url_request_builder.h"
#include "bat/ads/internal/ad_serving/ad_targeting/geographic/subdivision/get_subdivision_url_request_builder.h"
#include "bat/ads/internal/ads_client_helper.h"
#include "bat/ads/internal/locale/supported_subdivision_codes.h"
#include "bat/ads/internal/logging.h"
Expand Down
Loading