mg-pso-gui 0.1.243__tar.gz → 0.2.1__tar.gz

{mg_pso_gui-0.1.243 → mg_pso_gui-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.1.243
+Version: 0.2.1
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>

{mg_pso_gui-0.1.243 → mg_pso_gui-0.2.1}/mg_pso_gui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.1.243
+Version: 0.2.1
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>

{mg_pso_gui-0.1.243 → mg_pso_gui-0.2.1}/mg_pso_gui.egg-info/SOURCES.txt

@@ -10,15 +10,16 @@ mgpsogui/mgpsogui.py
 mgpsogui/start.yaml
 mgpsogui/gui/HomePage.py
 mgpsogui/gui/OptionManager.py
+mgpsogui/gui/OptionManager_backup.py
 mgpsogui/gui/__init__.py
+mgpsogui/gui/General/ParameterView.py
+mgpsogui/gui/General/__init__.py
 mgpsogui/gui/PlatformTab/PlatformTab.py
-mgpsogui/gui/PlatformTab/ServiceParametersView.py
 mgpsogui/gui/PlatformTab/__init__.py
 mgpsogui/gui/RunTab/RunTab.py
 mgpsogui/gui/RunTab/__init__.py
 mgpsogui/gui/SetupTab/BoundsEditorWindow.py
 mgpsogui/gui/SetupTab/BoundsList.py
-mgpsogui/gui/SetupTab/CalibrationParametersView.py
 mgpsogui/gui/SetupTab/CustomFunctionEditorWindow.py
 mgpsogui/gui/SetupTab/CustomFunctionMetrics.py
 mgpsogui/gui/SetupTab/FunctionsList.py
@@ -28,7 +29,6 @@ mgpsogui/gui/SetupTab/OptimalParameterView.py
 mgpsogui/gui/SetupTab/OverrideParameterMetrics.py
 mgpsogui/gui/SetupTab/OverrideParameterWindow.py
 mgpsogui/gui/SetupTab/SetupTab.py
-mgpsogui/gui/SetupTab/StaticParameterView.py
 mgpsogui/gui/SetupTab/StepView.py
 mgpsogui/gui/SetupTab/__init__.py
 mgpsogui/gui/VisualizeTab/MatrixEditor.py

mg_pso_gui-0.2.1/mgpsogui/gui/General/ParameterView.py

@@ -0,0 +1,90 @@
+from customtkinter import CTkScrollableFrame
+from customtkinter import CTkFrame
+from customtkinter import CTkLabel
+from customtkinter import CTkButton
+from customtkinter import CTkEntry
+from customtkinter import CTkOptionMenu
+from tkinter import StringVar as sv
+import tkinter as tk
+
+class ParameterView(CTkScrollableFrame):
+    def __init__(self, *args,
+                 option_manager: None,
+                 list_name: None,
+                 **kwargs):
+        super().__init__(*args, **kwargs)
+        
+        self.option_manager = option_manager
+        self.list_name = list_name
+        self.key_values = option_manager.get_list(self.list_name)
+        self.edit_mode = False
+        
+        self.render()
+
+    def clear(self):
+        self.containerFrame.destroy()
+        
+    def toggle_edit_mode(self):
+        self.clear()
+        self.edit_mode = not self.edit_mode
+        self.render()
+        
+    def render(self):
+        row = 0
+        index = 0
+        
+        self.containerFrame = CTkFrame(self)
+        self.containerFrame.grid(row=0, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")
+        self.containerFrame.grid_columnconfigure((0, 1, 2, 3, 4, 5), weight=1)
+
+        CTkLabel(self.containerFrame, text="Name:").grid(row=row, column=0, columnspan=3, padx=5, pady=5, sticky="")
+        CTkLabel(self.containerFrame, text="Value:").grid(row=row, column=3, columnspan=3, padx=5, pady=5, sticky="")
+        row += 1
+        
+        for key_value_pair in self.key_values:
+            CTkEntry(self.containerFrame, textvariable=self.key_values[index]["name"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
+            
+            if self.edit_mode:
+                return_func = lambda index=index: (self.clear(), self.option_manager.remove_key_value(self.list_name, index), self.render())
+                CTkButton(self.containerFrame, text="Remove", command=return_func).grid(row=row, column=3, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
+            else:
+                type = self.key_values[index]["type"].get()
+
+                if type == "boolean":
+                    bb = CTkOptionMenu(self.containerFrame, values=["True", "False", "NULL"], variable=self.key_values[index]["value"])
+                    bb.grid(row=row, column=3, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
+                elif type == "date":
+                    om_text_var = self.key_values[index]["value"]
+                    year = sv()
+                    month = sv()
+                    day = sv()
+                    vv = om_text_var.get().split("-")
+                    year.set(vv[0])
+                    month.set(vv[1])
+                    day.set(vv[2])
+                    year_options = [str(i) for i in range(1999, 2030)]
+                    month_options = [str(i) for i in range(1, 13)]
+                    day_options = [str(i) for i in range(1, 32)] 
+
+                    update_date = lambda om_text_var=om_text_var, year=year, month=month, day=day: om_text_var.set(f"{year.get()}-{month.get()}-{day.get()}")
+                    year_menu = CTkOptionMenu(self.containerFrame, textvariable=year, values=year_options, command=update_date)
+                    year_menu.grid(row=row, column=3, columnspan=1, padx=(0, 0), pady=(5, 5), sticky="ew")
+                    month_menu = CTkOptionMenu(self.containerFrame, textvariable=month, values=month_options, command=update_date)
+                    month_menu.grid(row=row, column=4, columnspan=1, padx=(0, 0), pady=(5, 5), sticky="ew")
+                    day_menu = CTkOptionMenu(self.containerFrame, textvariable=day, values=day_options, command=update_date)
+                    day_menu.grid(row=row, column=5, columnspan=1, padx=(0, 0), pady=(5, 5), sticky="ew")
+                else:
+                    bb = CTkEntry(self.containerFrame)
+                    bb.grid(row=row, column=3, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
+                    bb.configure(textvariable=self.key_values[index]["value"])
+            row += 1
+            index += 1
+            
+        if self.edit_mode:
+            CTkButton(self.containerFrame, text="Exit", command=self.toggle_edit_mode).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
+        else:
+            CTkButton(self.containerFrame, text="Edit", command=self.toggle_edit_mode).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
+            
+        add_key_func = lambda: (self.clear(), self.option_manager.add_key_value(self.list_name, "name", "value"), self.render())
+
+        CTkButton(self.containerFrame, text="Add Parameter", command=add_key_func).grid(row=row, column=3, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")

{mg_pso_gui-0.1.243 → mg_pso_gui-0.2.1}/mgpsogui/gui/HomePage.py

@@ -143,16 +143,15 @@ 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()['urls'][self.option_manager.service_modes[0]])
+		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=header_padding_x, pady=header_padding_y)
 
-		self.algorithm_optionmenu = customtkinter.CTkOptionMenu(self.sidebar_frame, variable=self.option_manager.get_arguments()['mode'], values=self.option_manager.service_modes, width=50, command=self.refresh_step_view)
+		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.algorithm_optionmenu.set(self.option_manager.service_modes[0])
 		
 		self.scaling_label = customtkinter.CTkLabel(self.sidebar_frame, text="Scale:", anchor="w")
 		self.scaling_label.grid(row=0, column=7, padx=header_padding_x, pady=header_padding_y)
@@ -221,22 +220,11 @@ class App(customtkinter.CTk):
 		GraphGenerator.generate_graphs(self)
 			
 	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.save_project(filename)
 				
 			self.save_button.configure(text="Saved!")
 			self.after(3000, lambda: self.save_button.configure(text="Save"))
@@ -246,8 +234,8 @@ class App(customtkinter.CTk):
 			self.after(3000, lambda: self.save_button.configure(text="Save"))
 	
 	def refresh_step_view(self, value):
-		mode = self.option_manager.get_arguments()['mode'].get()
-		self.service_url.configure(textvariable=self.option_manager.get_arguments()['urls'][mode])
+		mode = self.option_manager.get_mode()
+		self.service_url.configure(textvariable=self.option_manager.get("url"))
 
 		if mode == "Optimization":
 			self.test_button.configure(state="normal")
@@ -276,33 +264,7 @@ 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.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.option_manager.load_project(filename)
 			
 			self.steps_frame.clear()
 			self.steps_frame.render()
@@ -345,7 +307,7 @@ class App(customtkinter.CTk):
 			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')
@@ -377,6 +339,8 @@ class App(customtkinter.CTk):
 		self.run()	
 
 	def run(self):
+		pass
+		"""
 		metrics = self.option_manager.get_metrics()
 		self.running_config = metrics
 		
@@ -442,13 +406,13 @@ 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)
@@ -483,9 +447,7 @@ class App(customtkinter.CTk):
 	def watch_loop(self):
 		print("Watch loop running...")
 
-		# Check if file exists:
-		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)
@@ -526,7 +488,7 @@ class App(customtkinter.CTk):
 					for param in step.keys():
 						value = step[param]
 						target_step = all_steps[index]
-						for target_param in target_step['param']:
+						for target_param in target_step['parameter_objects']:
 							if target_param['name'].get() == param:
 								target_param['optimal_value'].set(value)
 					index += 1
@@ -579,7 +541,7 @@ class App(customtkinter.CTk):
 				print(e)
 				
 		# Parse data into interface
-		mode = self.option_manager.get_arguments()['mode'].get()
+		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()))