giuseppenuc/tesi-pegaso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix variety config

Browse Source
This commit is contained in:
Giuseppe Nucifora 2024-12-20 03:45:00 +01:00
parent 0a1bc21035
commit 84bfdaed48
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/olive-oil-dashboard.py
View File

@ -2143,9 +2143,8 @@ def update_loading_status(n_clicks, debug_mode):
config = load_config() config = load_config()
print(config)
DEV_MODE = config['inference']['debug_mode'] DEV_MODE = config['inference']['debug_mode']
if MODEL_LOADING: if not DEV_MODE and MODEL_LOADING:
return dbc.Alert( return dbc.Alert(
[ [
html.I(className="fas fa-spinner fa-spin me-2"), html.I(className="fas fa-spinner fa-spin me-2"),
@ -2824,7 +2823,7 @@ def check_percentages(perc1, perc2, perc3):
lambda x: x == '/') lambda x: x == '/')
] ]
) )
def load_configuration(active_tab, variety2, variety3, pathname): def load_configuration(active_tab, var2_current, var3_current, pathname):
try: try:
# Carica la configurazione # Carica la configurazione
config = load_config() config = load_config()
@ -2835,6 +2834,20 @@ def load_configuration(active_tab, variety2, variety3, pathname):
var2 = varieties[1] if len(varieties) > 1 else {"variety": None, "technique": None, "percentage": 0} var2 = varieties[1] if len(varieties) > 1 else {"variety": None, "technique": None, "percentage": 0}
var3 = varieties[2] if len(varieties) > 2 else {"variety": None, "technique": None, "percentage": 0} var3 = varieties[2] if len(varieties) > 2 else {"variety": None, "technique": None, "percentage": 0}
print(var2_current)
if var2_current is not None:
var2 = next((v for v in varieties if v["variety"] == var2_current),
{"variety": var2_current, "technique": None, "percentage": 0})
else:
var2 = {"variety": None, "technique": None, "percentage": 0}
if var3_current is not None:
var3 = next((v for v in varieties if v["variety"] == var3_current),
{"variety": var3_current, "technique": None, "percentage": 0})
else:
var3 = {"variety": None, "technique": None, "percentage": 0}
# Carica costi e marketing # Carica costi e marketing
costs = config['costs'] costs = config['costs']
fixed = costs.get('fixed', {}) fixed = costs.get('fixed', {})
@ -2842,8 +2855,8 @@ def load_configuration(active_tab, variety2, variety3, pathname):
transformation = costs.get('transformation', {}) transformation = costs.get('transformation', {})
marketing = costs.get('marketing', {}) marketing = costs.get('marketing', {})
var2_exists = var2["variety"] is not None var2_exists = True
var3_exists = var3["variety"] is not None var3_exists = True
return [ return [
# Configurazioni base (15 valori) # Configurazioni base (15 valori)