mg-pso-gui 0.1.40__py3-none-any.whl → 0.2.76__py3-none-any.whl

mgpsogui/gui/HomePage.py

@@ -1,4 +1,4 @@
-#!/usr/local/bin/python3.9
+#!/usr/local/bin/python3.10
 
 import os 
 import time
@@ -13,12 +13,14 @@ import requests
 import tkinter as tk
 import tkinter.messagebox
 import customtkinter
+from customtkinter import ThemeManager
 import json
 import os
 from PIL import Image, ImageTk
 import traceback
 from multiprocessing import Process
 from multiprocessing import Queue
+
 import re
 import pandas as pd
 import numpy as np
@@ -31,6 +33,7 @@ from queue import Empty
 from ..util import PSORunner
 from ..util import GraphGenerator
 from ..util.CTkToolTip import CTkToolTip as ctt
+from ..util import helpers as hp
 
 import subprocess
 import plotly.express as px
@@ -48,13 +51,12 @@ from .VisualizeTab import VisualizeTab as vt
 
 from ..util.CTkToolTip import CTkToolTip as ctt
 
-customtkinter.set_appearance_mode("Dark")  # Modes: "System" (standard), "Dark", "Light"
+customtkinter.set_appearance_mode("System")  # Modes: "System" (standard), "Dark", "Light"
 customtkinter.set_default_color_theme("blue")  # Themes: "blue" (standard), "green", "dark-blue"
 
 results_queue = Queue()
 stdout_queue = Queue()
 stderr_queue = Queue()
-cosu_queue = Queue()
 
 class App(customtkinter.CTk):
 	def __init__(self):
@@ -62,22 +64,37 @@ class App(customtkinter.CTk):
 		
 		self.option_manager = om.OptionManager()
 		
-		self.graph_selector_value = tk.StringVar()
-		self.graph_selector_value.set("Best Cost Stacked")
+		# self.graph_selector_value = tk.StringVar()
+		# self.graph_selector_value.set("Best Cost Stacked")
+
+		# self.graph_theme_value = tk.StringVar()
+		# self.graph_theme_value.set("Dark")
 
-		self.selected_csv = tk.StringVar()
-		self.selected_csv.set("No files found...")
+		# self.selected_csv = tk.StringVar()
+		# self.selected_csv.set("No files found...")
 		self.open_file = "None"
 		self.csv_data = None
 
-		self.selected_x = tk.StringVar()
-		self.selected_x.set("time")
+		# self.selected_csv2 = tk.StringVar()
+		# self.selected_csv2.set("No files found...")
+		self.open_file2 = "None"
+		self.csv_data2 = None
+
+		# self.selected_x = tk.StringVar()
+		# self.selected_x.set("time")
 
-		self.selected_y1 = tk.StringVar()
-		self.selected_y1.set("NONE")
+		# self.selected_y1 = tk.StringVar()
+		# self.selected_y1.set("NONE")
 
-		self.selected_y2 = tk.StringVar()
-		self.selected_y2.set("NONE")
+		# self.selected_y2 = tk.StringVar()
+		# self.selected_y2.set("NONE")
+
+		# self.figure_style = tk.StringVar()
+		# self.figure_style.set("Scatter")
+
+		# self.matrix_values = []
+		# self.matrix_values.append(tk.StringVar())
+		# self.matrix_values[0].set("NONE")
 
 		self.running_config = None
 		self.selected_graph_name = None
@@ -92,9 +109,10 @@ class App(customtkinter.CTk):
 		self.image_height = 720
 		self.progress_data = None
 		self.calibration_data = None
+		self.testing = False
 
 		# configure window
-		self.title("CSIP PSO")
+		self.title("COSU Manager")
 		self.geometry(f"{1920}x{1080}")
 
 		# configure grid layout (4x4)
@@ -107,7 +125,7 @@ class App(customtkinter.CTk):
 		self.sidebar_frame = customtkinter.CTkFrame(self, width=140, corner_radius=0)
 		self.sidebar_frame.grid(row=0, column=0, sticky="nsew")
 		self.sidebar_frame.grid_columnconfigure(4, weight=1)
-		self.logo_label = customtkinter.CTkLabel(self.sidebar_frame, text="CSIP PSO", font=customtkinter.CTkFont(size=20, weight="bold"))
+		self.logo_label = customtkinter.CTkLabel(self.sidebar_frame, text="COSU Manager", font=customtkinter.CTkFont(size=20, weight="bold"))
 		self.logo_label.grid(row=0, column=0, padx=(20, 10), pady=header_padding_y)
 		self.save_button = customtkinter.CTkButton(self.sidebar_frame, text="Save", width=60, command=self.save_project)
 		self.save_button.grid(row=0, column=1, padx=header_padding_x, pady=header_padding_y)
@@ -117,40 +135,39 @@ class App(customtkinter.CTk):
 		# 4 is service URL
 		self.service_label = customtkinter.CTkLabel(self.sidebar_frame, text="Service:", anchor="w")
 		self.service_label.grid(row=0, column=3, padx=(80, 5), pady=header_padding_y)
-		self.service_url = customtkinter.CTkEntry(self.sidebar_frame, textvariable=self.option_manager.get_arguments()['url'])
+		self.service_url = customtkinter.CTkEntry(self.sidebar_frame, textvariable=self.option_manager.get("url"))
 		self.service_url.grid(row=0, column=4, columnspan=1, padx=header_padding_x, pady=header_padding_y, sticky="nsew")
 		refresh_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "refresh.png")), size=(20, 20))
 		self.refresh_button = customtkinter.CTkButton(self.sidebar_frame, text=None, width=30, image=refresh_image, command=self.load)
 		ctt(self.refresh_button, delay=0.1, alpha=0.95, message="Connect to Service")
-		self.refresh_button.grid(row=0, column=5, padx=(5, 80), pady=header_padding_y)
+		self.refresh_button.grid(row=0, column=5, padx=header_padding_x, pady=header_padding_y)
+
+		self.algorithm_optionmenu = customtkinter.CTkOptionMenu(self.sidebar_frame, variable=self.option_manager.get_mode_sv(), values=self.option_manager.get_service_modes(), width=50, command=self.refresh_step_view)
+		self.algorithm_optionmenu.grid(row=0, column=6, padx=(5, 80), pady=header_padding_y)
 		
 		self.scaling_label = customtkinter.CTkLabel(self.sidebar_frame, text="Scale:", anchor="w")
-		self.scaling_label.grid(row=0, column=6, padx=header_padding_x, pady=header_padding_y)
+		self.scaling_label.grid(row=0, column=7, padx=header_padding_x, pady=header_padding_y)
 		self.scaling_optionemenu = customtkinter.CTkOptionMenu(self.sidebar_frame, values=["50%", "75%", "100%", "125%", "150%", "175%", "200%"], width=60,
-															   command=self.change_scaling_event)
-		self.scaling_optionemenu.grid(row=0, column=7, padx=header_padding_x, pady=header_padding_y)
+																command=self.change_scaling_event)
+		self.scaling_optionemenu.grid(row=0, column=8, padx=(5, 20), pady=header_padding_y)
 		self.scaling_optionemenu.set("100%")
 		
 		expand_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "expand.png")), size=(20, 20))
-		self.new_window = customtkinter.CTkButton(self.sidebar_frame, text=None, width=30, image=expand_image, command=self.new_window)
-		ctt(self.new_window, delay=0.1, alpha=0.95, message="Open New Window")
-		self.new_window.grid(row=0, column=8, padx=(5, 20), pady=header_padding_y)
+		#self.new_window = customtkinter.CTkButton(self.sidebar_frame, text=None, width=30, image=expand_image, command=self.open_new_window)
+		#ctt(self.new_window, delay=0.1, alpha=0.95, message="Open New Window")
+		#self.new_window.grid(row=0, column=9, padx=(5, 20), pady=header_padding_y)
 		
 		self.tabview = customtkinter.CTkTabview(self, bg_color="transparent", fg_color="transparent")
 		self.tabview.grid(row=1, column=0, padx=(0, 0), pady=(10, 10), sticky="nsew")
 		tab1 = "Platform"
 		tab2 = "Setup"
-		tab3 = "Logs"
+		tab3 = "Project"
 		tab4 = "Results"
-		#tab5 = "Results"
 		
 		self.tabview.add(tab1)
 		self.tabview.add(tab2)
 		self.tabview.add(tab4)
 		self.tabview.add(tab3)
-		#self.tabview.add(tab5)
-		
-		#self.tabview.configure(state="disabled")
 		
 		pt.create_tab(self, self.tabview.tab(tab1))
 		st.create_tab(self, self.tabview.tab(tab2))
@@ -167,18 +184,14 @@ class App(customtkinter.CTk):
 		self.footer_progress_bar = customtkinter.CTkProgressBar(self.footer_frame)
 		self.footer_progress_bar.grid(row=0, column=4, padx=(50, 100), pady=header_padding_y, sticky="ew")
 		self.footer_progress_bar.set(0)
-		
-		self.algorithm_optionmenu = customtkinter.CTkOptionMenu(self.footer_frame, values=["PSO", "Halton"], width=50)
-		self.algorithm_optionmenu.grid(row=0, column=6, padx=header_padding_x, pady=header_padding_y)
-		self.algorithm_optionmenu.set("PSO")
 
 		play_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "play.png")), size=(20, 20))
 		self.run_button = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=play_image, command=self.run)
-		ctt(self.run_button, delay=0.1, alpha=0.95, message="Start Calibration")
+		ctt(self.run_button, delay=0.1, alpha=0.95, message="Start Job")
 		self.run_button.grid(row=0, column=7, padx=(20, 5), pady=header_padding_y)
 
 		test_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "test.png")), size=(20, 20))
-		self.test_button = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=test_image, command=self.run)
+		self.test_button = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=test_image, command=self.run_test)
 		ctt(self.test_button, delay=0.1, alpha=0.95, message="Start Testing")
 		self.test_button.grid(row=0, column=8, padx=(5, 5), pady=header_padding_y)
 		
@@ -192,74 +205,26 @@ class App(customtkinter.CTk):
 		ctt(self.download_button, delay=0.1, alpha=0.95, message="Download Results")
 		self.download_button.grid(row=0, column=10, padx=(5, 20), pady=header_padding_y)
 
+		self.refresh_step_view(0)
 		self.after(1000, self.running_loop)
 
 	def update_graph(self, value):
 		self.vis_sidebar.refresh()
 		GraphGenerator.generate_graphs(self)
-
-	'''def _resize_image(self, event):
-		self.graph_label.update_idletasks()
-		new_width = self.graph_label.winfo_width()
-		new_height = self.graph_label.winfo_height()
-		
-		alt_width = new_height * 1.77778
-		alt_height = new_width / 1.77778
-		
-		if (new_width < new_height):
-			new_height = alt_height
-		else:
-			new_width = alt_width
-		
-		self.image_width = new_width
-		self.image_height = new_height
-		
-		self.graph_image = customtkinter.CTkImage(self.graph_image_obj, size=(new_width, new_height))
-		self.graph_label.configure(image=self.graph_image)
-		self.graph_label.update_idletasks()
-			
-   
-	def update_graph(self, value):
-		selected_graph = self.graph_selector_value.get()
-		info = self.option_manager.get_project_data()
-		folder = os.path.join(info['path'], info['name'])
-		
-		if not os.path.exists(folder):
-			os.makedirs(folder)
-		
-		if (selected_graph == "Best Cost Stacked"):
-			self.selected_graph_name = "best_cost_stacked"
-		elif (selected_graph == "Best Cost by Round"):
-			self.selected_graph_name = "best_cost_by_round"
-		elif (selected_graph == "Iteration Table"):
-			self.selected_graph_name = "table"
-		elif (selected_graph == "Calibrated Parameters"):
-			self.selected_graph_name = "calibrated_params_by_round"
-
-		image_path = os.path.join(folder, self.selected_graph_name + ".png")
-		if not os.path.exists(image_path):
-			image_path = os.path.join("./images", "up.png")
-		self.graph_image_obj = Image.open(image_path)
-		self.graph_image = customtkinter.CTkImage(self.graph_image_obj, size=(self.image_width * self.image_scale, self.image_height * self.image_scale))
-		self.graph_label.configure(image=self.graph_image)'''
 			
 	def save_project(self):
-		metrics = self.option_manager.get_metrics()
-  
-		# Add the calibration_progress dataframe to the json
-		if (self.progress_data is not None):
-			metrics["calibration_progress"] = self.progress_data.to_json()
-		# Add the calibration_data to the json
-		if (self.calibration_data is not None):
-			metrics["calibration_data"] = self.calibration_data
-
 		filename = asksaveasfilename(filetypes=[("JSON", "*.json")], initialfile="config", defaultextension="json", title="Save Project")
 		
 		try:
-		
-			# Convert metrics to json and save to file with proper spacing
-			with open(filename, "w") as f:
-				f.write(json.dumps(metrics, indent=4))
+			self.option_manager.set_path(filename)
+			self.option_manager.save_project(filename)
+
+			folder = self.option_manager.get_project_folder()
+			if not os.path.exists(folder):
+				os.makedirs(folder)
+
+			if not os.path.exists(os.path.join(folder, "results")):
+				os.makedirs(os.path.join(folder, "results"))
 				
 			self.save_button.configure(text="Saved!")
 			self.after(3000, lambda: self.save_button.configure(text="Save"))
@@ -268,7 +233,59 @@ class App(customtkinter.CTk):
 			print(e)
 			self.after(3000, lambda: self.save_button.configure(text="Save"))
 	
-	def new_window(self):
+	def refresh_step_view(self, value):
+		mode = self.option_manager.get_mode()
+		self.service_url.configure(textvariable=self.option_manager.get("url"))
+		self.graph_theme.configure(variable=self.option_manager.get("graph_theme"))
+
+		# Limit graph selection based on mode
+		self.graph_selector.configure(variable=self.option_manager.get("selected_graph"))
+		graph_types = []
+		if mode == "Optimization":
+			graph_types = ["Best Cost Stacked", "Best Cost by Round", "Custom CSV", "Compare CSV"]
+		elif mode == "Sensitivity Analysis":
+			graph_types = ["Custom CSV", "Compare CSV"]
+		elif mode == "Sampling: Halton" or mode == "Sampling Random":
+			graph_types = ["Sampling CSV", "Matrix Editor"]
+		self.graph_selector.configure(values=graph_types)
+		selected_graph = self.option_manager.get("selected_graph").get()
+		if selected_graph not in graph_types:
+			self.option_manager.get("selected_graph").set(graph_types[0])
+
+
+		if mode == "Optimization":
+			self.test_button.configure(state="normal")
+			self.test_button.configure(fg_color=get_color("CTkButton"))
+			self.download_button.configure(state="normal")
+			self.download_button.configure(fg_color=get_color("CTkButton"))
+		else:
+			self.test_button.configure(state="disabled")
+			self.test_button.configure(fg_color="gray")
+			self.download_button.configure(state="disabled")
+			self.download_button.configure(fg_color="gray")
+
+		self.vis_sidebar.clear()
+		self.vis_sidebar.render()
+
+		self.steps_frame.clear()
+		self.steps_frame.render()
+
+		self.static_param_frame.clear()
+		self.static_param_frame.render()
+		
+		self.calib_param_frame.clear()
+		self.calib_param_frame.render()
+
+		self.service_param_frame.clear()
+		self.service_param_frame.render()
+
+		self.optimal_param_frame.clear()
+		self.optimal_param_frame.render()
+
+		self.project_name_label.configure(text=self.option_manager.get_project_data()["name"])
+		self.project_path_label.configure(text=self.option_manager.get_project_data()["path"])
+
+	def open_new_window(self):
 		# Shell out and run ./main.py
 		subprocess.Popen(["python3", "../mgpsogui.py"])
 	
@@ -279,53 +296,29 @@ class App(customtkinter.CTk):
 		
 		try:
 		
-			# Load config.json and convert to metrics
-			with open(filename, "r") as f:
-				metrics = json.loads(f.read())
-			
+			self.option_manager.load_project(filename)
 			self.option_manager.set_path(filename)
-			
-			if "arguments" in metrics:
-				metrics["arguments"]["calibration_parameters"] = metrics["calibration_parameters"]
-			
-			if "service_parameters" in metrics:
-				self.option_manager.set_service_parameters(metrics["service_parameters"])
-				self.tabview.configure(state="enabled")
-	
-			if "calibration_progress" in metrics:
-				self.progress_data = pd.read_json(metrics["calibration_progress"])
-				self.calibration_data = metrics["calibration_data"]
-				print(self.progress_data)
-	
-			if "calibration_data" in metrics:
-				self.calibration_data = metrics["calibration_data"]
-				print(self.calibration_data)
-			
-			print(metrics)
-			
-			self.option_manager.clear()
-			self.option_manager.add_arguments(metrics["arguments"])
-			self.option_manager.add_steps(metrics["steps"])
-			
-			self.steps_frame.clear()
-			self.steps_frame.render()
 
-			self.static_param_frame.clear()
-			self.static_param_frame.render()
+			folder = self.option_manager.get_project_folder()
+			if not os.path.exists(folder):
+				os.makedirs(folder)
+
+			if not os.path.exists(os.path.join(folder, "results")):
+				os.makedirs(os.path.join(folder, "results"))
 			
-			self.calib_param_frame.clear()
-			self.calib_param_frame.render()
-   
-			info = self.option_manager.get_project_data()
-			folder = os.path.join(info['path'], info['name'])
-			self.HRU_data = pd.read_csv(os.path.join(folder, "results", "HRU_1.csv"), skiprows=3)
-			print(self.HRU_data)
+			self.refresh_step_view(0)
 			
 			self.load_button.configure(text="Loaded!")
 			self.after(3000, lambda: self.load_button.configure(text="Load"))
+
+			self.load()
 			
 		except Exception as e:
 			print(e)
+			# Print stack trace 
+			traceback.print_exc()
+			
+
 			self.load_button.configure(text="Error!")
 			self.after(3000, lambda: self.load_button.configure(text="Load"))
 
@@ -343,12 +336,12 @@ class App(customtkinter.CTk):
 	def make_request(self):
 		service_url = self.service_url.get()
 		try:
-			response = requests.get(service_url)
+			response = requests.get(service_url, timeout=5)
 				
 			response_json = json.loads(response.text)
 			status = response.status_code
 			
-			self.option_manager.set_service_parameters(response_json)
+			self.option_manager.set_data("service_request_data", response_json)
 			
 			self.service_status.delete('0.0', tk.END)
 			self.service_status.insert(text=str(status), index='0.0')
@@ -358,29 +351,45 @@ class App(customtkinter.CTk):
 			self.service_description.insert(text=str(response_json["metainfo"]["description"]), index='0.0')
 			self.service_details.delete('0.0', tk.END)
 			self.service_details.insert(text=json.dumps(response_json, indent=4), index='0.0')
-			
+
 			self.refresh_button.configure(fg_color="green")
 		except Exception as e:
 			self.refresh_button.configure(fg_color="red")
+			self.after(1000, lambda: self.refresh_button.configure(fg_color=get_color("CTkButton")))
+
+		self.refresh_step_view(0)
 		
 	
 	def load(self):
 		# Make HTTP request to service_url and save the result to bounds.json
 		
-		self.default_button_color = self.refresh_button.cget("fg_color")
-		
 		self.refresh_button.configure(fg_color="gray")
 		
 		self.after(10, self.make_request)
-		self.after(3000, lambda: self.refresh_button.configure(fg_color=self.default_button_color))
+		self.after(3000, lambda: self.refresh_button.configure(fg_color=get_color("CTkButton")))
 		
+	def run_test(self):
+		self.testing = True
+		self.run()	
+
 	def run(self):
-		metrics = self.option_manager.get_metrics()
-		self.running_config = metrics
 		
+		data = self.option_manager.get_all_data()
+		mode = self.option_manager.get_mode()
+		data = data[mode]
+
+		self.running_config = data
+		
+		#if self.testing:
+		#	steps = metrics['steps']
+		#	for step in steps:
+		#		for param in step['param']:
+		#			param['default_value'] = param['optimal_value']
+		self.testing = False
+
 		self.progress_data = None
 		self.calibration_data = None
-  
+
 		#self.progress_bar.configure(mode="indeterminnate")
 		#self.progress_bar.start()
 		self.footer_progress_bar.configure(mode="indeterminnate")
@@ -389,26 +398,16 @@ class App(customtkinter.CTk):
 		self.data_x = [0]
 		self.data_y = [0]
 		
-		self.progress_message_middle.configure(text="Calibration starting...")
+		#self.progress_message_middle.configure(text="Job starting...")
 		self.footer_progress_label.configure(text="Starting...")
 		
-		self.textbox.insert("0.0", "Starting calibration...\n\n")
-		self.textbox.insert("0.0", "Calibration Parameters:\n")
-		self.textbox.insert("0.0", json.dumps(metrics, indent=4) + "\n\n")
+		self.textbox.insert("0.0", "Starting job...\n\n")
+		self.textbox.insert("0.0", "Job Parameters:\n")
+		self.textbox.insert("0.0", json.dumps(data, indent=4) + "\n\n")
 		try:
-			info = self.option_manager.get_project_data()
-			folder = os.path.join(info['path'], info['name'])
-
-			if not os.path.exists(folder):
-				os.makedirs(folder)
-
-			if (os.path.exists(os.path.join(folder, 'output.txt'))):
-				os.remove(os.path.join(folder, 'output.txt'))
-				
-			if (os.path.exists(os.path.join(folder, 'error.txt'))):
-				os.remove(os.path.join(folder, 'error.txt'))
+			folder = self.option_manager.get_project_folder()
 			
-			self.train_process = Process(target=PSORunner.run_process, args=(stdout_queue, stderr_queue, results_queue, cosu_queue, metrics, folder))
+			self.train_process = Process(target=PSORunner.run_process, args=(stdout_queue, stderr_queue, results_queue, data, folder, mode))
 			self.train_process.daemon = True
 			self.train_process.start()
 			self.after(1000, self.watch_loop)
@@ -420,10 +419,10 @@ class App(customtkinter.CTk):
 			self.textbox.insert("0.0", "Stack trace:\n")
 			self.textbox.insert("0.0", traceback.format_exc())
 			self.textbox.insert("0.0", "\n\n")
-			self.textbox.insert("0.0", "Calibration failed!")
-			self.progress_message_left.configure(text="")
-			self.progress_message_middle.configure(text="Calibration failed! See error log below.")
-			self.progress_message_right.configure(text="")
+			self.textbox.insert("0.0", "Job failed!")
+			#self.progress_message_left.configure(text="")
+			#self.progress_message_middle.configure(text="Job failed! See error log below.")
+			#self.progress_message_right.configure(text="")
 			self.footer_progress_label.configure(text="Failed")
 			#self.progress_bar.stop()
 			self.footer_progress_bar.stop()
@@ -431,35 +430,35 @@ class App(customtkinter.CTk):
 			self.footer_progress_bar.configure(mode="determinate")
 			#self.progress_bar.set(0)
 			self.footer_progress_bar.set(0)
+	
 			
 	def stop(self):
 		print("Stopping...")
 		self.train_process.terminate()
 		
-		info = self.option_manager.get_project_data()
-		folder = os.path.join(info['path'], info['name'])
+		folder = self.option_manager.get_project_folder()
 			
 		if not os.path.exists(folder):
 			os.makedirs(folder)
 		
 		# Stop the process
-		if (os.path.exists(os.path.join(folder, 'output.txt'))):
-			os.remove(os.path.join(folder, 'output.txt'))
+		#if (os.path.exists(os.path.join(folder, 'output.txt'))):
+		#	os.remove(os.path.join(folder, 'output.txt'))
 		
-		if (os.path.exists(os.path.join(folder, 'error.txt'))):
-			os.remove(os.path.join(folder, 'error.txt'))
+		#if (os.path.exists(os.path.join(folder, 'error.txt'))):
+		#	os.remove(os.path.join(folder, 'error.txt'))
 			
-		self.textbox.insert("0.0", "\nCalibration terminated!\n")
+		self.textbox.insert("0.0", "Job terminated!\n")
 		#self.progress_bar.stop()
 		self.footer_progress_bar.stop()
 		#self.progress_bar.configure(mode="determinate")
 		self.footer_progress_bar.configure(mode="determinate")
 		#self.progress_bar.set(0)
 		self.footer_progress_bar.set(0)
-		self.progress_message_left.configure(text="")
-		self.progress_message_middle.configure(text="Calibration stopped!")
+		#self.progress_message_left.configure(text="")
+		#self.progress_message_middle.configure(text="Job stopped!")
 		self.footer_progress_label.configure(text="Stopped")
-		self.progress_message_right.configure(text="")
+		#self.progress_message_right.configure(text="")
 		
 	def running_loop(self):
 		try:
@@ -470,9 +469,9 @@ class App(customtkinter.CTk):
 			self.after(1000, self.running_loop)
 
 	def watch_loop(self):
-		# Check if file exists:
-		info = self.option_manager.get_project_data()
-		folder = os.path.join(info['path'], info['name'])
+		print("Watch loop running...")
+
+		folder = self.option_manager.get_project_folder()
 			
 		if not os.path.exists(folder):
 			os.makedirs(folder)
@@ -484,29 +483,47 @@ class App(customtkinter.CTk):
 				print("# " + stdout_line, flush=True)
 				with open(os.path.join(folder, 'output.txt'), 'a') as f:
 					f.write(stdout_line)
-				
 			except Empty:
 				break
 			
 		while True:
 			try:
 				stderr_line = stderr_queue.get_nowait()
-				
 				print("? " + stderr_line, flush=True)
 				with open(os.path.join(folder, 'error.txt'), 'a') as f:
 					f.write(stderr_line)
 				
 			except Empty:
 				break
-			
+
 		while True:
 			try:
-				cosu_line = cosu_queue.get_nowait()
+				trace = results_queue.get_nowait()
 				
-				print("COSU " + cosu_line, flush=True)
+				print("TRACE " + str(trace), flush=True)
+	
+				final_results = hp.extract_final_round_values(trace)
+				print("Final results: " + str(final_results), flush=True)
+	
+				all_steps = self.option_manager.get_steps()
+				data = final_results["data"]
+				index = 0
+				for step in data:
+					for param in step.keys():
+						value = step[param]
+						target_step = all_steps[index]
+						for target_param in target_step['parameter_objects']:
+							if target_param['name'].get() == param:
+								target_param['optimal_value'].set(value)
+					index += 1
+				print("Applied optimal values")
 			except Empty:
 				break
+			except Exception as e:
+				print("Some error happened when getting the trace!")
+				print(e)
 		
+		# Write output to textbox
 		if (os.path.exists(os.path.join(folder, 'output.txt'))):
 			with open(os.path.join(folder, 'output.txt'), 'r') as f:
 				lines = f.readlines()
@@ -519,6 +536,7 @@ class App(customtkinter.CTk):
 				print(new_characters, end="")
 				
 			try:
+				# REPLACE THIS WITH READING THE STEP TRACE JSON for PSO
 				with open(os.path.join(folder, "output.txt"), "r") as f:
 					text = f.read()
 
@@ -540,65 +558,31 @@ class App(customtkinter.CTk):
 				calibrated_params = [ast.literal_eval(i) for i in calibrated_params]
 				best_particle_values = [ast.literal_eval(i) for i in best_particle_values]
 				progress_values = [tuple(map(float, i)) for i in progress_values]
-				
-				#print("Current params: " + str(calibrated_params), flush=True)
-	
 				self.calibration_data = calibrated_params
 				
-				#GraphGenerator.calibrated_params_by_round(self.running_config['steps'], calibrated_params, self.option_manager)
-				#self.update_graph("")
 			except Exception as e:
-				# Print stack trace
 				traceback.print_exc()
-				
 				print(e)
 				
-		if (os.path.exists(os.path.join(folder, 'error.txt'))):
-			with open(os.path.join(folder, 'error.txt'), 'r') as f:
-				lines = f.readlines()
-				lines_string = "".join(lines)
-				self.data_cache = lines_string
-				
-				pattern = r'(\d+)%\|.*\|(\d+)/(\d+)(?:,\sbest_cost=(\d+\.\d+))?' # The magic of AI
-				matches = re.findall(pattern, self.data_cache)
-				filtered_matches = [match for match in matches if match[3] != '']
-				matches = filtered_matches
-
-				if len(matches) > 0:
-					df = pd.DataFrame(matches, columns=['percent', 'completed_rounds', 'total_rounds', 'best_cost'], dtype=float)
-					df = df[df['best_cost'] != '']
-					df = df.dropna()
-					df = df.drop_duplicates()
-					df['round_step'] = (df['completed_rounds'].diff() < 0).cumsum()
-					df = df.drop_duplicates(subset=['completed_rounds', 'round_step'])
-					self.progress_data = df
-
-					match = matches[-1]
-					percent = int(match[0])
-					completed_rounds = int(match[1])
-					total_rounds = int(match[2])
-					best_cost = float(match[3]) if match[3] else None
-					
-					if (percent > 0):
-						#self.progress_bar.stop()
-						self.footer_progress_bar.stop()
-						#self.progress_bar.configure(mode="determinate")
-						self.footer_progress_bar.configure(mode="determinate")
-						#self.progress_bar.set(percent/100)
-						self.footer_progress_bar.set(percent/100)
-						self.progress_message_left.configure(text="Percent Complete: " + str(percent) + "%")
-						self.progress_message_middle.configure(text=str(completed_rounds) + "/" + str(total_rounds))
-						self.footer_progress_label.configure(text=str(completed_rounds) + "/" + str(total_rounds))
-						self.progress_message_right.configure(text="Best Cost: " + str(best_cost))
-					else:
-						#self.progress_bar.configure(mode="indeterminate")
-						self.footer_progress_bar.configure(mode="indeterminate")
-						#self.progress_bar.start()
-						self.footer_progress_bar.start()
-						self.progress_message_left.configure(text="")
-						self.progress_message_middle.configure(text="Starting new round...")
-						self.footer_progress_label.configure(text="Next round...")
-						self.progress_message_right.configure(text="")
+		# Parse data into interface
+		mode = self.option_manager.get_mode()
+		if mode == "Optimization":
+			if (os.path.exists(os.path.join(folder, 'error.txt'))):
+				data = hp.parse_pso_error(os.path.join(folder, 'error.txt'), len(self.option_manager.get_steps()))
+				print(data)
+				self.progress_data = data["data"]
+				self.footer_progress_bar.stop()
+				self.footer_progress_bar.configure(mode="determinate")
+				self.footer_progress_bar.set(data["percent"]/100)
+				self.footer_progress_label.configure(text="Round: " + str(data["round"]) + " - Step: " + str(data["step"]))
+		else:
+			if (os.path.exists(os.path.join(folder, 'output.txt'))):
+				data = hp.parse_sampling_output(os.path.join(folder, 'output.txt'))
+				print(data)
+				self.footer_progress_bar.stop()
+				self.footer_progress_bar.configure(mode="determinate")
+				self.footer_progress_bar.set(data["percent"]/100)
+				self.footer_progress_label.configure(text=str(round(data["percent"])) + "%")
 				
 				
 				
@@ -611,13 +595,25 @@ class App(customtkinter.CTk):
 			self.footer_progress_bar.configure(mode="indeterminate")
 			#self.progress_bar.start()
 			self.footer_progress_bar.start()
-			self.progress_message_left.configure(text="")
-			self.progress_message_middle.configure(text="Calibration finished!")
-			self.progress_message_right.configure(text="")
-			self.textbox.insert("0.0", "\nCalibration finished!\n")
-
-		
-	
+			#self.progress_message_left.configure(text="")
+			#self.progress_message_middle.configure(text="Job finished!")
+			#self.progress_message_right.configure(text="")
+			self.textbox.insert("0.0", "\nJob finished!\n")
+
+			# IF "./crash.txt" exists write it to the textbox
+			if (os.path.exists(os.path.join(folder, 'crash.txt'))):
+				with open(os.path.join(folder, 'crash.txt'), 'r') as f:
+					lines = f.readlines()
+					lines_string = "".join(lines)
+					print("CRASH OCCURRED!")
+					print(lines_string)
+					self.textbox.insert('0.0', lines_string)
+					self.textbox.insert('0.0', "CRASH OCCURRED!\n")
+				# Delete the file
+				os.remove(os.path.join(folder, 'crash.txt'))
+
+def get_color(class_name, property = "fg_color"):
+    return ThemeManager.theme[class_name][property]
 
 def start():
 	app = App()