Skip to content

Commit eb63686

Browse files
grodinogrodino
committed
Autopep8 formatting
1 parent 16c4160 commit eb63686

File tree

9 files changed

+697
-539
lines changed

9 files changed

+697
-539
lines changed

‎automation/config.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
N_FACTORS_VALUES = [5, 20, 50, 60, 70, 80, 200, 500, 1_000, 3_000]
88
# N_FACTORS_VALUES = [5, 20, 50, 60, 70, 80, 200, 500, 1_000]
99
# REGULARIZATION_VALUES = [.005, .01, 1.0, 10.0, 100.0, 200.0, 5_000.0, 1e5, 1e6]
10-
REGULARIZATION_VALUES = [1e-5, .005, .01, 1.0, 10.0, 100.0, 200.0, 5_000.0, 1e5, 1e6]
10+
REGULARIZATION_VALUES = [1e-5, .005, .01, 1.0,
11+
10.0, 100.0, 200.0, 5_000.0, 1e5, 1e6]
1112

1213
# TODO: change these values when using the better dataset (not the confidence pre-corrected ...)
1314
OPT_N_FACTORS = 3_000
1415
OPT_REGULARIZATION = 1e6
1516
# OPT_N_FACTORS = 500
16-
# OPT_REGULARIZATION = 5_000.0
17+
# OPT_REGULARIZATION = 5_000.0

‎automation/interactive.py

+45-37
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import luigi
44
import dash
55
from dash import dcc
6-
from dash import html
6+
from dash import html
77
from dash.dependencies import Input
88
from dash.dependencies import Output
99
import plotly.express as px
@@ -38,14 +38,14 @@ def reco_div_vs_user_div_vs_latent_factors(msd_dataset, local_scheduler=False):
3838
merged = data_task.run()
3939

4040
fig = px.scatter(
41-
merged,
42-
x='diversity',
41+
merged,
42+
x='diversity',
4343
y='reco_diversity',
4444
hover_data=['user'],
4545
custom_data=['n_factors'],
4646
animation_frame='n_factors',
4747
animation_group='user',
48-
color='volume',
48+
color='volume',
4949
color_continuous_scale=px.colors.sequential.Viridis,
5050
width=float('inf'),
5151
height=900,
@@ -79,7 +79,7 @@ def reco_div_vs_user_div_vs_latent_factors(msd_dataset, local_scheduler=False):
7979
], style={'width': '50%'})
8080

8181
], style={'display': 'flex'}),
82-
82+
8383
# Data container
8484
html.Div([
8585
dcc.Markdown("""
@@ -131,7 +131,7 @@ def handle_click_data(click_data):
131131
'common_tags'
132132
]
133133
user_info = {key: user_info[key] for key in keys}
134-
134+
135135
listened_tags_fig = px.bar(
136136
listened_tag_distribution,
137137
title='Listened tags weight distribution',
@@ -147,11 +147,13 @@ def handle_click_data(click_data):
147147
)
148148
recommended_tags_fig.update_xaxes(range=[0, 30])
149149
recommended_tags_fig.update_layout(xaxis_tickangle=45)
150-
150+
151151
else:
152152
user_info = {}
153-
listened_tags_fig = px.bar(title='Listened tags weight distribution')
154-
recommended_tags_fig = px.bar(title='Recommended tags weight distribution')
153+
listened_tags_fig = px.bar(
154+
title='Listened tags weight distribution')
155+
recommended_tags_fig = px.bar(
156+
title='Recommended tags weight distribution')
155157

156158
return json.dumps(user_info, indent=2), listened_tags_fig, recommended_tags_fig
157159

@@ -181,14 +183,14 @@ def div_increase_vs_user_div_vs_latent_factors(msd_dataset, local_scheduler=Fals
181183
merged = data_task.run()
182184

183185
fig = px.scatter(
184-
merged,
185-
x='diversity',
186+
merged,
187+
x='diversity',
186188
y='diversity_increase',
187189
hover_data=['user'],
188190
custom_data=['n_factors'],
189191
animation_frame='n_factors',
190192
animation_group='user',
191-
color='volume',
193+
color='volume',
192194
color_continuous_scale=px.colors.sequential.Viridis,
193195
width=float('inf'),
194196
height=900,
@@ -222,7 +224,7 @@ def div_increase_vs_user_div_vs_latent_factors(msd_dataset, local_scheduler=Fals
222224
], style={'width': '50%'})
223225

224226
], style={'display': 'flex'}),
225-
227+
226228
# Data container
227229
html.Div([
228230
dcc.Markdown("""
@@ -274,7 +276,7 @@ def handle_click_data(click_data):
274276
'common_tags'
275277
]
276278
user_info = {key: user_info[key] for key in keys}
277-
279+
278280
listened_tags_fig = px.bar(
279281
listened_tag_distribution,
280282
title='Listened tags weight distribution',
@@ -290,11 +292,13 @@ def handle_click_data(click_data):
290292
)
291293
recommended_tags_fig.update_xaxes(range=[0, 30])
292294
recommended_tags_fig.update_layout(xaxis_tickangle=45)
293-
295+
294296
else:
295297
user_info = {}
296-
listened_tags_fig = px.bar(title='Listened tags weight distribution')
297-
recommended_tags_fig = px.bar(title='Recommended tags weight distribution')
298+
listened_tags_fig = px.bar(
299+
title='Listened tags weight distribution')
300+
recommended_tags_fig = px.bar(
301+
title='Recommended tags weight distribution')
298302

299303
return json.dumps(user_info, indent=2), listened_tags_fig, recommended_tags_fig
300304

@@ -324,16 +328,16 @@ def reco_div_vs_user_div_vs_reco_volume(msd_dataset, local_scheduler=False):
324328
merged = data_task.run()
325329

326330
fig = px.scatter(
327-
merged,
328-
x='diversity',
331+
merged,
332+
x='diversity',
329333
y='reco_diversity',
330334
hover_data=['user'],
331335
custom_data=['n_recommendations'],
332336
animation_frame='n_recommendations',
333337
animation_group='user',
334338
# marginal_x='histogram',
335339
# marginal_y='histogram',
336-
color='volume',
340+
color='volume',
337341
color_continuous_scale=px.colors.sequential.Viridis,
338342
width=float('inf'),
339343
height=900,
@@ -349,7 +353,7 @@ def reco_div_vs_user_div_vs_reco_volume(msd_dataset, local_scheduler=False):
349353
tickvals=[1, 1.477, 2, 2.477, 3],
350354
ticktext=['10', '30', '100', '300', '1000'],
351355
))
352-
356+
353357
app = dash.Dash()
354358
app.layout = html.Div([
355359
# Graphs container
@@ -367,7 +371,7 @@ def reco_div_vs_user_div_vs_reco_volume(msd_dataset, local_scheduler=False):
367371
], style={'width': '50%'})
368372

369373
], style={'display': 'flex'}),
370-
374+
371375
# Data container
372376
html.Div([
373377
dcc.Markdown("""
@@ -419,7 +423,7 @@ def handle_click_data(click_data):
419423
'common_tags'
420424
]
421425
user_info = {key: user_info[key] for key in keys}
422-
426+
423427
listened_tags_fig = px.bar(
424428
listened_tag_distribution,
425429
title='Listened tags weight distribution',
@@ -435,15 +439,17 @@ def handle_click_data(click_data):
435439
)
436440
recommended_tags_fig.update_xaxes(range=[0, 30])
437441
recommended_tags_fig.update_layout(xaxis_tickangle=45)
438-
442+
439443
else:
440444
user_info = {}
441-
listened_tags_fig = px.bar(title='Listened tags weight distribution')
442-
recommended_tags_fig = px.bar(title='Recommended tags weight distribution')
445+
listened_tags_fig = px.bar(
446+
title='Listened tags weight distribution')
447+
recommended_tags_fig = px.bar(
448+
title='Recommended tags weight distribution')
443449

444450
return json.dumps(user_info, indent=2), listened_tags_fig, recommended_tags_fig
445451

446-
app.run_server(debug=True, use_reloader=False)
452+
app.run_server(debug=True, use_reloader=False)
447453

448454

449455
def div_increase_vs_user_div_vs_reco_volume(msd_dataset, local_scheduler=False, alpha=2):
@@ -470,16 +476,16 @@ def div_increase_vs_user_div_vs_reco_volume(msd_dataset, local_scheduler=False,
470476
merged = data_task.run()
471477

472478
fig = px.scatter(
473-
merged,
474-
x='diversity',
479+
merged,
480+
x='diversity',
475481
y='diversity_increase',
476482
hover_data=['user'],
477483
custom_data=['n_recommendations'],
478484
animation_frame='n_recommendations',
479485
animation_group='user',
480486
# marginal_x='histogram',
481487
# marginal_y='histogram',
482-
color='volume',
488+
color='volume',
483489
color_continuous_scale=px.colors.sequential.Viridis,
484490
width=float('inf'),
485491
height=900,
@@ -495,7 +501,7 @@ def div_increase_vs_user_div_vs_reco_volume(msd_dataset, local_scheduler=False,
495501
tickvals=[1, 1.477, 2, 2.477, 3],
496502
ticktext=['10', '30', '100', '300', '1000'],
497503
))
498-
504+
499505
app = dash.Dash()
500506
app.layout = html.Div([
501507
# Graphs container
@@ -513,7 +519,7 @@ def div_increase_vs_user_div_vs_reco_volume(msd_dataset, local_scheduler=False,
513519
], style={'width': '50%'})
514520

515521
], style={'display': 'flex'}),
516-
522+
517523
# Data container
518524
html.Div([
519525
dcc.Markdown("""
@@ -572,7 +578,7 @@ def handle_click_data(click_data):
572578
'common_tags'
573579
]
574580
user_info = {key: user_info[key] for key in keys}
575-
581+
576582
listened_tags_fig = px.bar(
577583
listened_tag_distribution,
578584
title='Listened tags weight distribution',
@@ -588,12 +594,14 @@ def handle_click_data(click_data):
588594
)
589595
recommended_tags_fig.update_xaxes(range=[0, 30])
590596
recommended_tags_fig.update_layout(xaxis_tickangle=45)
591-
597+
592598
else:
593599
user_info = {}
594-
listened_tags_fig = px.bar(title='Listened tags weight distribution')
595-
recommended_tags_fig = px.bar(title='Recommended tags weight distribution')
600+
listened_tags_fig = px.bar(
601+
title='Listened tags weight distribution')
602+
recommended_tags_fig = px.bar(
603+
title='Recommended tags weight distribution')
596604

597605
return json.dumps(user_info, indent=2), listened_tags_fig, recommended_tags_fig
598606

599-
app.run_server(debug=True, use_reloader=False)
607+
app.run_server(debug=True, use_reloader=False)

0 commit comments

Comments
 (0)