code refactor

Author: marthendalnunes

app.py

@@ -1,19 +1,24 @@
 # Dash dependencies
 import dash
-import dash_bootstrap_components as dbc
 from dash.dependencies import ClientsideFunction, Input, Output, State
-from utils import visualizations
 import flask
 from flask_talisman import Talisman
 
 # Additional dependencies
 import json
+import gzip
 import copy
 import pandas as pd
 from datetime import datetime
 
 # Import layout components
-from layout.layout import layout, fig_data, fig_validator_yields
+from layout.layout import layout
+
+with gzip.open('./data/plots_data_new.json.gz', 'r') as fin:
+    fig_data = json.loads(fin.read().decode('utf-8'))
+
+with gzip.open('./data/plots_validator_yields.json.gz', 'r') as fin:
+    fig_validator_yields = json.loads(fin.read().decode('utf-8'))
 
 
 # Configure scenarios
@@ -44,7 +49,7 @@
     'style-src': ['\'self\'', '\'unsafe-inline\''],
     'img-src': ['\'self\'', '\'unsafe-eval\'', '\'unsafe-inline\'', 'data:'], 
 }
-Talisman(server, content_security_policy=csp)
+#Talisman(server, content_security_policy=csp)
 
 app = dash.Dash(__name__,
                 server=server,
@@ -257,16 +262,15 @@ def update_validator_yields_graph(max_validator_cap,
              mev_string + ':' +
              str(validator_adoption) + ':' +
               max_validator_cap_values[max_validator_cap])
-    validator_yields_data = fig_validator_yields[LookUp]
+    validator_yields_data = fig_validator_yields[LookUp]['data']
 
-    #for item in validator_yields_data:
-    #    item.update({'x': fig_validator_yields['x']})
+    for item in validator_yields_data:
+        item.update({'x': fig_validator_yields['data_x']})
 
-    validator_yields_figure = validator_yields_data
-    #{
-    #    'layout': fig_validator_yields['layout'],
-    #   'data': validator_yields_data
-    #}
+    validator_yields_figure = {
+       'layout': fig_validator_yields['layout'],
+       'data': validator_yields_data
+    }
 
     _max_validator_cap_scenarios = dict((v, k) for k, v in max_validator_cap_scenarios.items())
     max_validator_cap_dropdown = _max_validator_cap_scenarios.get(max_validator_cap, 'Custom Value')

assets/style.css

@@ -87,7 +87,7 @@ footer img {
 }
 .input-row{
     display: grid;
-    grid-template-columns: repeat(4, minmax(250px, 1fr));
+    grid-template-columns: repeat(2, minmax(250px, 1fr));
     justify-content: center;
     grid-gap: 10px;
 }

data/plots_validator_yields.json.gz

@@ -3,8 +3,10 @@
 from datetime import datetime
 import json
 
-simulation_file = open('./data/simulation_data.json',)
-simulation_data = json.load(simulation_file)
+
+with open('./data/simulation_data.json', 'r') as simulation_file:
+    simulation_data = json.load(simulation_file)
+
 pos_dates_dropdown_poits = simulation_data['info']['parameters']['0']['points']
 eip1559_slider_points = simulation_data['info']['parameters']['1']['points']
 mid_eip1559_slider_point = eip1559_slider_points[len(eip1559_slider_points)//2]

layout/inputs/inputs_layout.py

@@ -16,25 +16,26 @@
 import compress_json
 from datetime import datetime
 
-simulation_file = open('./data/simulation_data.json',)
-simulation_data = json.load(simulation_file)
+#simulation_file = open('./data/simulation_data.json',)
+#simulation_data = json.load(simulation_file)
 
 #plots_file = open('./data/plots_data_new.json',)
-fig_data = compress_json.load('./data/plots_data_new.json.gz')
+#fig_data = compress_json.load('./data/plots_data_new.json.gz')
 
 #plots_validator_yields_file = open('./data/no_x_new_plots_validator_yields.json',)
-fig_validator_yields = compress_json.load('./data/plots_validator_yields.json.gz')
+fig_validator_yields = {}
+#compress_json.load('./data/plots_validator_yields.json.gz')
 
-
-initial_fig_eth_supply = fig_data['2021-12-1:0:0:None']
-#{
+initial_fig_eth_supply = {}
+initial_fig_eth_supply_mobile = {}
+#initial_fig_eth_supply = {
 #    'layout':fig_data['2021-12-1:0:0:None']["layout"],
 #    'data': fig_data["historical"]["data"] + fig_data['2021-12-1:0:0:None']["data"]
 #}
-initial_fig_eth_supply_mobile = copy.deepcopy(initial_fig_eth_supply)
-initial_fig_eth_supply_mobile["layout"]["annotations"].clear() 
-
-initial_fig_validator_yields =  fig_validator_yields['2022-3-1:2:0.02:3:None']
+#initial_fig_eth_supply_mobile = copy.deepcopy(initial_fig_eth_supply)
+#initial_fig_eth_supply_mobile["layout"]["annotations"].clear() 
+initial_fig_validator_yields = {}
+#initial_fig_validator_yields =  fig_validator_yields['2022-3-1:2:0.02:3:None']
 #{
 #        'layout': fig_validator_yields['layout'],
 #        'data': fig_validator_yields['2022-3-1:2:0.02:3']