1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
use std::collections::{HashMap, HashSet};
use anyhow::{anyhow, Context};
use async_trait::async_trait;
use futures::{future::join_all, TryFutureExt};
use merino_settings::SuggestionProviderConfig;
use merino_suggest_traits::{
reconfigure_or_remake, CacheInputs, CacheStatus, SetupError, SuggestError, SuggestionProvider,
SuggestionRequest, SuggestionResponse,
};
use serde::Serialize;
#[derive(Default)]
pub struct IdMulti {
providers: HashMap<String, Box<dyn SuggestionProvider>>,
}
#[derive(Debug, Serialize)]
pub struct ProviderDetails {
pub id: String,
pub availability: ProviderAvailability,
}
#[derive(Debug, Serialize)]
#[serde(rename_all = "snake_case")]
pub enum ProviderAvailability {
EnabledByDefault,
}
impl IdMulti {
#[must_use]
pub fn new(providers: HashMap<String, Box<dyn SuggestionProvider>>) -> Self {
Self { providers }
}
pub fn add_provider(
&mut self,
name: String,
provider: Box<dyn SuggestionProvider>,
) -> &mut Self {
if !provider.is_null() {
self.providers.insert(name, provider);
}
self
}
#[must_use]
pub fn list_providers(&self) -> Vec<ProviderDetails> {
self.providers
.keys()
.map(|id| ProviderDetails {
id: id.clone(),
availability: ProviderAvailability::EnabledByDefault,
})
.collect()
}
pub async fn suggest_from_ids(
&self,
request: SuggestionRequest,
ids: &HashSet<String>,
) -> Result<SuggestionResponse, SuggestError> {
let v: Result<Vec<SuggestionResponse>, _> = join_all(
self.providers
.iter()
.filter(|(name, _)| ids.contains(*name))
.map(|(name, provider)| {
let name = name.clone();
provider.suggest(request.clone()).map_ok(move |mut res| {
res.suggestions
.iter_mut()
.for_each(move |s| s.provider = name.clone());
res
})
}),
)
.await
.into_iter()
.collect();
v.map(|mut responses| {
let mut rv = responses
.pop()
.unwrap_or_else(|| SuggestionResponse::new(vec![]));
for response in responses {
rv.suggestions.extend_from_slice(&response.suggestions);
rv.cache_status = match (rv.cache_status, response.cache_status) {
(a, b) if a == b => a,
(a, CacheStatus::NoCache) => a,
_ => CacheStatus::Mixed,
}
}
rv
})
}
pub fn get_provider_mut(&mut self, name: &str) -> Option<&mut Box<dyn SuggestionProvider>> {
self.providers.get_mut(name)
}
}
#[async_trait]
impl SuggestionProvider for IdMulti {
fn name(&self) -> String {
let provider_names = self
.providers
.keys()
.cloned()
.collect::<Vec<_>>()
.join(", ");
format!("NamedMulti({})", provider_names)
}
fn cache_inputs(&self, req: &SuggestionRequest, cache_inputs: &mut dyn CacheInputs) {
for provider in self.providers.values() {
provider.cache_inputs(req, cache_inputs);
}
}
async fn suggest(
&self,
request: SuggestionRequest,
) -> Result<SuggestionResponse, SuggestError> {
let ids: HashSet<_> = self.providers.keys().cloned().collect();
self.suggest_from_ids(request, &ids).await
}
#[tracing::instrument(level = "info", skip(self, new_config, make_fresh))]
async fn reconfigure(
&mut self,
new_config: serde_json::Value,
make_fresh: &merino_suggest_traits::MakeFreshType,
) -> Result<(), SetupError> {
let new_configs: HashMap<String, SuggestionProviderConfig> =
serde_json::from_value(new_config)
.context("coercing provider config")
.map_err(SetupError::InvalidConfiguration)?;
let new_names: HashSet<_> = new_configs.keys().cloned().collect();
let old_names: HashSet<_> = self.providers.keys().cloned().collect();
let names_to_add = new_names.difference(&old_names);
let names_to_remove = old_names.difference(&new_names);
let names_to_reconfigure = old_names.intersection(&new_names);
for name in names_to_remove {
tracing::info!(provider_name = %name, r#type = "suggestion-providers.reconfigure.removing-provider", "Removing provider");
self.providers.remove(name);
}
for name in names_to_reconfigure {
tracing::info!(provider_name = %name, r#type = "suggestion-providers.reconfigure.reconfiguring-provider", "Reconfiguring provider");
let provider = self
.get_provider_mut(name)
.ok_or_else(|| SetupError::Internal(anyhow!("expected provider not found")))?;
let config = new_configs
.get(name)
.ok_or_else(|| SetupError::Internal(anyhow!("expected config not found")))?;
reconfigure_or_remake(provider, config.clone(), make_fresh).await?;
}
for name in names_to_add {
tracing::info!(provider_name = %name, r#type = "suggestion-providers.reconfigure.adding-provider", "Adding fresh provider");
let config = new_configs
.get(name)
.ok_or_else(|| SetupError::Internal(anyhow!("expected config not found")))?
.clone();
let new_provider = make_fresh(config).await?;
self.providers.insert(name.to_string(), new_provider);
}
Ok(())
}
}
#[cfg(test)]
mod tests {
use std::collections::{HashMap, HashSet};
use super::IdMulti;
use crate::FixedProvider;
use async_trait::async_trait;
use fake::{Fake, Faker};
use futures::{future::ready, FutureExt};
use merino_settings::providers::{FixedConfig, SuggestionProviderConfig};
use merino_suggest_traits::{
CacheStatus, MakeFreshType, NullProvider, SetupError, SuggestError, SuggestionProvider,
SuggestionRequest, SuggestionResponse,
};
use tokio::sync::oneshot::error::TryRecvError;
struct ChannelProvider {
tx: tokio::sync::mpsc::Sender<()>,
rx: tokio::sync::Mutex<tokio::sync::mpsc::Receiver<()>>,
}
#[async_trait]
impl SuggestionProvider for ChannelProvider {
fn name(&self) -> String {
"channel".to_string()
}
async fn suggest(
&self,
_request: SuggestionRequest,
) -> Result<SuggestionResponse, SuggestError> {
self.tx.send(()).await.unwrap();
self.rx.lock().await.recv().await.unwrap();
Ok(SuggestionResponse {
cache_status: CacheStatus::NoCache,
cache_ttl: None,
suggestions: vec![],
})
}
async fn reconfigure(
&mut self,
_new_config: serde_json::Value,
_make_fresh: &MakeFreshType,
) -> Result<(), SetupError> {
unimplemented!()
}
}
#[tokio::test]
async fn multi_is_concurrent() {
let (prov1_input_tx, prov1_input_rx) = tokio::sync::mpsc::channel::<()>(4);
let (prov1_output_tx, mut prov1_output_rx) = tokio::sync::mpsc::channel::<()>(4);
let (prov2_input_tx, prov2_input_rx) = tokio::sync::mpsc::channel::<()>(4);
let (prov2_output_tx, mut prov2_output_rx) = tokio::sync::mpsc::channel::<()>(4);
let (suggestion_result_tx, mut suggestion_result_rx) =
tokio::sync::oneshot::channel::<()>();
let mut providers: HashMap<_, Box<dyn SuggestionProvider>> = HashMap::new();
providers.insert(
"1".to_string(),
Box::new(ChannelProvider {
tx: prov1_output_tx,
rx: tokio::sync::Mutex::new(prov1_input_rx),
}),
);
providers.insert(
"2".to_string(),
Box::new(ChannelProvider {
tx: prov2_output_tx,
rx: tokio::sync::Mutex::new(prov2_input_rx),
}),
);
let multi = IdMulti::new(providers);
let task_handle = tokio::spawn(async move {
let request: SuggestionRequest = Faker.fake();
multi.suggest(request).await.unwrap();
suggestion_result_tx.send(()).unwrap();
});
tokio::join!(prov1_output_rx.recv(), prov2_output_rx.recv());
assert!(matches!(
suggestion_result_rx.try_recv(),
Err(TryRecvError::Empty)
));
prov1_input_tx.send(()).await.unwrap();
assert!(matches!(
suggestion_result_rx.try_recv(),
Err(TryRecvError::Empty)
));
prov2_input_tx.send(()).await.unwrap();
suggestion_result_rx.await.unwrap();
task_handle.await.unwrap();
}
#[tokio::test]
async fn test_reconfigure() {
let prov_fixed = FixedProvider {
value: "foo".to_owned(),
};
let prov_null = NullProvider;
let providers: HashMap<_, _> = [
(
"fixed".to_owned(),
Box::new(prov_fixed) as Box<dyn SuggestionProvider>,
),
("null".to_owned(), Box::new(prov_null)),
]
.into_iter()
.collect();
let mut provider = IdMulti::new(providers);
let make_fresh: MakeFreshType = Box::new(move |fresh_config: SuggestionProviderConfig| {
let provider: Box<dyn SuggestionProvider> = match fresh_config {
SuggestionProviderConfig::Fixed(config) => Box::new(FixedProvider {
value: config.value,
}),
SuggestionProviderConfig::Null => Box::new(NullProvider),
_ => unreachable!(),
};
ready(Ok(provider)).boxed()
});
let to_update = SuggestionProviderConfig::Fixed(FixedConfig {
value: "bar".to_owned(),
});
let to_add = SuggestionProviderConfig::Fixed(FixedConfig {
value: "baz".to_owned(),
});
let provider_configs: HashMap<_, _> = [
("fixed".to_owned(), to_update),
("another_fixed".to_owned(), to_add),
]
.into_iter()
.collect();
let value = serde_json::to_value(provider_configs).expect("failed to serialize");
provider
.reconfigure(value, &make_fresh)
.await
.expect("failed to reconfigure");
assert_eq!(provider.providers.len(), 2);
let response = provider
.suggest(Faker.fake())
.await
.expect("failed to suggest");
assert_eq!(
response
.suggestions
.iter()
.map(|suggestion| suggestion.title.as_str())
.collect::<HashSet<_>>(),
["bar", "baz"].into_iter().collect::<HashSet<_>>()
);
}
}