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

Show bandit data #643

Merged
merged 6 commits into from
Dec 4, 2024
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
35 changes: 35 additions & 0 deletions app/controllers/BanditDataController.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package controllers

import com.gu.googleauth.AuthAction
import com.typesafe.scalalogging.LazyLogging
import io.circe.syntax.EncoderOps
import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponents, Result}
import services.DynamoBanditData
import utils.Circe.noNulls
import zio.{IO, ZEnv, ZIO}

import scala.concurrent.{ExecutionContext, Future}

class BanditDataController(authAction: AuthAction[AnyContent],
components: ControllerComponents,
stage: String,
runtime: zio.Runtime[ZEnv],
dynamo: DynamoBanditData,
)(implicit ec: ExecutionContext) extends AbstractController(components) with LazyLogging {

private def run(f: => ZIO[ZEnv, Throwable, Result]): Future[Result] =
runtime.unsafeRunToFuture {
f.catchAll(error => {
logger.error(s"Returning InternalServerError to client: ${error.getMessage}", error)
IO.succeed(InternalServerError(error.getMessage))
})
}

def getDataForTest(channel: String, testName: String): Action[AnyContent] = authAction.async { request =>
run {
dynamo
.getDataForTest(testName, channel)
.map(data => Ok(noNulls(data.asJson)))
}
}
}
119 changes: 119 additions & 0 deletions app/services/DynamoBanditData.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
package services

import com.typesafe.scalalogging.StrictLogging
import io.circe.{Decoder, Encoder}
import models.DynamoErrors.{DynamoError, DynamoGetError}
import software.amazon.awssdk.services.dynamodb.DynamoDbClient
import software.amazon.awssdk.services.dynamodb.model.{AttributeValue, QueryRequest}
import utils.Circe.dynamoMapToJson
import io.circe.generic.auto._
import zio.blocking.effectBlocking
import zio.{ZEnv, ZIO}

import scala.jdk.CollectionConverters._

/**
* Models for data received from DynamoDb
*/

case class VariantSample(variantName: String, annualisedValueInGBP: Double, annualisedValueInGBPPerView: Double, views: Double)
case class TestSample(testName: String, variants: List[VariantSample], timestamp: String)
object TestSample {
implicit val decoder = Decoder[TestSample]
implicit val encoder = Encoder[TestSample]
}

/**
* Models for data returned to the client
*/

// models the mean and views for each variant up to a certain timestamp
case class EnrichedVariantSampleData(variantName: String, views: Double, mean: Double)
case class EnrichedTestSampleData(timestamp: String, variants: List[EnrichedVariantSampleData])

// Final mean and views for a variant
case class VariantSummary(variantName: String, mean: Double, views: Double)

case class BanditData(variantSummaries: List[VariantSummary], samples: List[EnrichedTestSampleData])
object BanditData {
implicit val decoder = Decoder[BanditData]
implicit val encoder = Encoder[BanditData]
}

class DynamoBanditData(stage: String, client: DynamoDbClient) extends StrictLogging {
private val tableName = s"support-bandit-$stage"

private def query(testName: String, channel: String): ZIO[ZEnv, DynamoGetError, java.util.List[java.util.Map[String, AttributeValue]]] = {
effectBlocking {
client.query(
QueryRequest
.builder()
.tableName(tableName)
.keyConditionExpression("testName = :testName")
.expressionAttributeValues(Map(
":testName" -> AttributeValue.builder.s(s"${channel}_$testName").build
).asJava)
.scanIndexForward(true)
.build()
).items()
}.mapError(DynamoGetError)
}

private def sampleMean(samples: List[VariantSample], population: Double): Double =
samples.foldLeft(0D)((acc, sample) =>
acc + (sample.views / population) * sample.annualisedValueInGBPPerView
)

private def buildVariantSummaries(samples: List[TestSample]): List[VariantSummary] =
samples
.flatMap(_.variants)
.groupBy(variantSample => variantSample.variantName)
.map { case (variantName, samples) =>
val population = samples.map(_.views).sum
val mean = sampleMean(samples, population)
VariantSummary(variantName = variantName, mean = mean, views = population)
}
.toList

// For each hourly sample, calculate the means up to that point, so that we can visualise how the Bandit's view of the variants changed over time
private def buildEnrichedSamples(samples: List[TestSample]): List[EnrichedTestSampleData] = {
val samplesByVariant: Map[String, List[VariantSample]] = samples
.flatMap(_.variants)
.groupBy(variantSample => variantSample.variantName)

samples
.zipWithIndex
.foldLeft(Array.empty[EnrichedTestSampleData]) { case (enrichedSamples, (sample, idx)) =>
val variants = sample.variants.map(currentVariantSample => {
val previousSamples = samplesByVariant(currentVariantSample.variantName).take(idx+1)

val population = previousSamples.map(_.views).sum
val mean = sampleMean(previousSamples, population)
EnrichedVariantSampleData(currentVariantSample.variantName, currentVariantSample.views, mean)
})

enrichedSamples :+ EnrichedTestSampleData(sample.timestamp, variants)
}
.toList
}

def getDataForTest(testName: String, channel: String): ZIO[ZEnv, DynamoError, BanditData] =
query(testName, channel)
.map { results =>
results.asScala
.map(item => dynamoMapToJson(item).as[TestSample])
.flatMap {
case Right(row) => Some(row)
case Left(error) =>
logger.error(s"Failed to decode item from Dynamo: ${error.getMessage}")
None
}
.toList
}
.map { samples: List[TestSample] =>
val variantSummaries = buildVariantSummaries(samples)
val enrichedSamples = buildEnrichedSamples(samples)

BanditData(variantSummaries, enrichedSamples)
}
}
5 changes: 4 additions & 1 deletion app/wiring/AppComponents.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import play.api.libs.ws.ahc.AhcWSComponents
import play.api.mvc.AnyContent
import play.api.{BuiltInComponentsFromContext, NoHttpFiltersComponents}
import router.Routes
import services.{Athena, Aws, CapiService, DynamoArchivedBannerDesigns, DynamoArchivedChannelTests, DynamoBannerDesigns, DynamoCampaigns, DynamoChannelTests, DynamoSuperMode, S3}
import services.{Athena, Aws, CapiService, DynamoArchivedBannerDesigns, DynamoArchivedChannelTests, DynamoBanditData, DynamoBannerDesigns, DynamoCampaigns, DynamoChannelTests, DynamoSuperMode, S3}
import software.amazon.awssdk.services.dynamodb.DynamoDbClient
import software.amazon.awssdk.services.s3.model.GetObjectRequest

Expand Down Expand Up @@ -73,6 +73,8 @@ class AppComponents(context: Context, stage: String) extends BuiltInComponentsFr
val dynamoBannerDesigns = new DynamoBannerDesigns(stage, dynamoClient)
val dynamoArchivedBannerDesigns = new DynamoArchivedBannerDesigns(stage, dynamoClient)

val dynamoBanditData = new DynamoBanditData(stage, dynamoClient)

val sdcUrlOverride: Option[String] = sys.env.get("SDC_URL")

override lazy val router: Router = new Routes(
Expand All @@ -98,6 +100,7 @@ class AppComponents(context: Context, stage: String) extends BuiltInComponentsFr
new DefaultPromosController(authAction,controllerComponents, stage, runtime),
new SuperModeController(authAction, controllerComponents, stage, runtime, dynamoSuperModeService, athena),
new AnalyticsController(authAction, controllerComponents, stage, runtime, athena),
new BanditDataController(authAction, controllerComponents, stage, runtime, dynamoBanditData),
assets
)
}
1 change: 1 addition & 0 deletions conf/routes
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ GET /frontend/epic-article-data controllers.SuperModeCont

# ----- analytics ----- #
GET /frontend/analytics/:channel/:testName controllers.AnalyticsController.getDataForVariants(channel: String, testName: String)
GET /frontend/bandit/:channel/:testName controllers.BanditDataController.getDataForTest(channel: String, testName: String)

# Map static resources from the /public folder to the /assets URL path
GET /assets/*file controllers.Assets.at(path="/public", file)
145 changes: 145 additions & 0 deletions public/src/components/channelManagement/BanditAnalyticsButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
import { makeStyles } from '@mui/styles';
import { Button, Dialog, Theme, Typography } from '@mui/material';
import React, { useEffect } from 'react';
import useOpenable from '../../hooks/useOpenable';
import { format } from 'date-fns';
import { LineChart, CartesianGrid, Line, XAxis, YAxis, Legend, Tooltip } from 'recharts';

const useStyles = makeStyles(({}: Theme) => ({
dialog: {
padding: '10px',
},
heading: {
margin: '6px 12px 0 12px',
fontSize: 18,
fontWeight: 500,
},
chartContainer: {
margin: '12px',
},
}));

interface VariantSummary {
variantName: string;
mean: number;
views: number;
}
interface VariantSample {
variantName: string;
views: number;
mean: number;
}
interface TestSample {
timestamp: string;
variants: VariantSample[];
}
interface BanditData {
variantSummaries: VariantSummary[];
samples: TestSample[];
}

interface SamplesChartProps {
data: BanditData;
variantNames: string[];
fieldName: keyof VariantSample;
}

const Colours = ['red', 'blue', 'green', 'orange', 'yellow'];

type ChartDataPoint = Record<string, string | number>;

const SamplesChart = ({ data, variantNames, fieldName }: SamplesChartProps) => {
const chartData = data.samples
.map(({ timestamp, variants }) => {
if (variants.length > 0) {
const sample: ChartDataPoint = {
dateHour: format(Date.parse(timestamp), 'yyyy-MM-dd hh:mm'),
};
variants.forEach(variant => {
sample[variant.variantName] = variant[fieldName];
});
return sample;
}
return undefined;
})
.filter(sample => !!sample);

return (
<LineChart width={800} height={500} data={chartData}>
<XAxis dataKey="dateHour" />
<YAxis />
<CartesianGrid stroke="#eee" strokeDasharray="5 5" />
<Legend />
<Tooltip />
{variantNames.map((name, idx) => (
<Line key={name} type="monotone" dataKey={name} stroke={Colours[idx]} />
))}
</LineChart>
);
};

interface BanditAnalyticsButton {
testName: string;
channel: string;
}

export const BanditAnalyticsButton: React.FC<BanditAnalyticsButton> = ({
testName,
channel,
}: BanditAnalyticsButton) => {
const classes = useStyles();
const [isOpen, open, close] = useOpenable();
const [data, setData] = React.useState<BanditData>();
const [loading, setLoading] = React.useState<boolean>(false);

useEffect(() => {
setLoading(true);

fetch(`/frontend/bandit/${channel}/${testName}`)
.then(resp => resp.json())
.then(data => {
setData(data);
setLoading(false);
});
}, [testName, channel]);

const variantNames = data?.variantSummaries.map(variant => variant.variantName) ?? [];

return (
<>
<Button variant="outlined" onClick={open}>
Analytics
</Button>

<Dialog open={isOpen} onClose={close} fullWidth maxWidth="lg" className={classes.dialog}>
<div className={classes.heading}>
<h3>Bandit data for: {testName}</h3>
</div>

<div className={classes.chartContainer}>
{loading && <Typography>Loading...</Typography>}
{data && (
<div>
<h2>Impressions</h2>
<SamplesChart data={data} variantNames={variantNames} fieldName={'views'} />

<h2>Scores</h2>
<SamplesChart data={data} variantNames={variantNames} fieldName={'mean'} />

<h2>Total impressions:</h2>
{data.variantSummaries
.sort((va, vb) => vb.views - va.views)
.map(({ variantName, views }) => (
<div key={variantName}>
<Typography>
{variantName}: {views}
</Typography>
</div>
))}
</div>
)}
</div>
</Dialog>
</>
);
};
Loading
Loading