mg-pso-gui 0.1.87__tar.gz → 0.2.76__tar.gz

{mg-pso-gui-0.1.87 → mg_pso_gui-0.2.76}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.1.87
+Version: 0.2.76
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>
 Keywords: python,muti-group,pso,particle,swarm,optimization,gui
 Classifier: Development Status :: 1 - Planning
 Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
@@ -23,7 +23,7 @@ Requires-Dist: csip-cosu
 Requires-Dist: kaleido
 Requires-Dist: pillow
 
-# Multigroup PSO Gui
+# Multigroup PSO GUI
 
 This application provides an interface for setting up, configuring, running, and the visualization of multigroup PSO training.
 
@@ -49,7 +49,7 @@ mgpsogui
 
 You may need to add a folder to PATH.
 
-**Note:** If you run into an error saying that PIL.Image was not able to be imported on Ubuntu please force reinstall Pillow. 
+**Note:** If you run into an error saying that PIL.Image was not able to be imported on Ubuntu please force reinstall Pillow.
 
 ```bash
 python3 -m pip install --upgrade --force-reinstall Pillow
@@ -57,7 +57,7 @@ python3 -m pip install --upgrade --force-reinstall Pillow
 
 ## Instructions for Windows
 
-Download and install Python 3.10 through the Microsoft Store, this makes Python easily accessible in Windows Terminal. 
+Download and install Python 3.10 through the Microsoft Store, this makes Python easily accessible in Windows Terminal.
 
 Once installed run this command to install the interface:
 
@@ -79,7 +79,7 @@ C:\Users\robertcordingly\AppData\Local\Packages\PythonSoftwareFoundation.Python.
 
 ## Instructions for MacOS
 
-To install Tkinter and Python 3 it is best to use Homebrew: 
+To install Tkinter and Python 3 it is best to use Homebrew:
 
 Install Homebrew
 
@@ -103,15 +103,15 @@ Then install MG PSO Gui:
 python3 -m pip install mg-pso-gui
 ```
 
-You may need to add /Library/Frameworks/Python.framework/Versions/3.8/bin to path to run the interface with 'mgpsogui,' otherwise run the interface:
+You may need to add /Library/Frameworks/Python.framework/Versions/3.10/bin to path to run the interface with 'mgpsogui,' otherwise run the interface:
 
 ```bash
-/Library/Frameworks/Python.framework/Versions/3.8/bin/mgpsogui
+/Library/Frameworks/Python.framework/Versions/3.10/bin/mgpsogui
 ```
 
 # Getting Started
 
-After getting the GUI to launch, it is first recommended to start with one of the default config files. Default config files are available here: https://drive.google.com/file/d/1Ra4Um7KgCghMidyrrLrD6wFSXJZd3zkX/view?usp=share_link 
+After getting the GUI to launch, it is first recommended to start with one of the default config files. Default config files are available here: https://drive.google.com/file/d/1Ra4Um7KgCghMidyrrLrD6wFSXJZd3zkX/view?usp=share_link
 
 To load a config simply click the "load" button in the left side bar and select the file using the file picker. After a config has been loaded, enter a service URL, and click "Connect".  If the connection is successful the other tabs on the interface will be unlocked and you will have full access to all of the interface's features.
 
@@ -123,7 +123,7 @@ Each tab of the interface serves a different purpose described here.
 
 The platform tab is where you defined the backend service used to train the model. If the service already exists, simply add the URL to the service field and press connect to get parameters from the service. After doing this the other tabs will unlock.
 
-If you do not already have a backend service deployed, the platform tab provides tools to create a local environment using Docker and Minikube. 
+If you do not already have a backend service deployed, the platform tab provides tools to create a local environment using Docker and Minikube.
 
 ## Setup
 
@@ -329,4 +329,3 @@ The Visualize tab allows you to generate a variety of different graphs and table
     ]
 }
 ```
-

{mg-pso-gui-0.1.87 → mg_pso_gui-0.2.76}/mg_pso_gui.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.1.87
+Version: 0.2.76
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>
 Keywords: python,muti-group,pso,particle,swarm,optimization,gui
 Classifier: Development Status :: 1 - Planning
 Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
@@ -23,7 +23,7 @@ Requires-Dist: csip-cosu
 Requires-Dist: kaleido
 Requires-Dist: pillow
 
-# Multigroup PSO Gui
+# Multigroup PSO GUI
 
 This application provides an interface for setting up, configuring, running, and the visualization of multigroup PSO training.
 
@@ -49,7 +49,7 @@ mgpsogui
 
 You may need to add a folder to PATH.
 
-**Note:** If you run into an error saying that PIL.Image was not able to be imported on Ubuntu please force reinstall Pillow. 
+**Note:** If you run into an error saying that PIL.Image was not able to be imported on Ubuntu please force reinstall Pillow.
 
 ```bash
 python3 -m pip install --upgrade --force-reinstall Pillow
@@ -57,7 +57,7 @@ python3 -m pip install --upgrade --force-reinstall Pillow
 
 ## Instructions for Windows
 
-Download and install Python 3.10 through the Microsoft Store, this makes Python easily accessible in Windows Terminal. 
+Download and install Python 3.10 through the Microsoft Store, this makes Python easily accessible in Windows Terminal.
 
 Once installed run this command to install the interface:
 
@@ -79,7 +79,7 @@ C:\Users\robertcordingly\AppData\Local\Packages\PythonSoftwareFoundation.Python.
 
 ## Instructions for MacOS
 
-To install Tkinter and Python 3 it is best to use Homebrew: 
+To install Tkinter and Python 3 it is best to use Homebrew:
 
 Install Homebrew
 
@@ -103,15 +103,15 @@ Then install MG PSO Gui:
 python3 -m pip install mg-pso-gui
 ```
 
-You may need to add /Library/Frameworks/Python.framework/Versions/3.8/bin to path to run the interface with 'mgpsogui,' otherwise run the interface:
+You may need to add /Library/Frameworks/Python.framework/Versions/3.10/bin to path to run the interface with 'mgpsogui,' otherwise run the interface:
 
 ```bash
-/Library/Frameworks/Python.framework/Versions/3.8/bin/mgpsogui
+/Library/Frameworks/Python.framework/Versions/3.10/bin/mgpsogui
 ```
 
 # Getting Started
 
-After getting the GUI to launch, it is first recommended to start with one of the default config files. Default config files are available here: https://drive.google.com/file/d/1Ra4Um7KgCghMidyrrLrD6wFSXJZd3zkX/view?usp=share_link 
+After getting the GUI to launch, it is first recommended to start with one of the default config files. Default config files are available here: https://drive.google.com/file/d/1Ra4Um7KgCghMidyrrLrD6wFSXJZd3zkX/view?usp=share_link
 
 To load a config simply click the "load" button in the left side bar and select the file using the file picker. After a config has been loaded, enter a service URL, and click "Connect".  If the connection is successful the other tabs on the interface will be unlocked and you will have full access to all of the interface's features.
 
@@ -123,7 +123,7 @@ Each tab of the interface serves a different purpose described here.
 
 The platform tab is where you defined the backend service used to train the model. If the service already exists, simply add the URL to the service field and press connect to get parameters from the service. After doing this the other tabs will unlock.
 
-If you do not already have a backend service deployed, the platform tab provides tools to create a local environment using Docker and Minikube. 
+If you do not already have a backend service deployed, the platform tab provides tools to create a local environment using Docker and Minikube.
 
 ## Setup
 
@@ -329,4 +329,3 @@ The Visualize tab allows you to generate a variety of different graphs and table
     ]
 }
 ```
-

{mg-pso-gui-0.1.87 → mg_pso_gui-0.2.76}/mg_pso_gui.egg-info/SOURCES.txt

@@ -10,29 +10,40 @@ 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/__init__.py
+mgpsogui/gui/RunTab/OptimalParameterView.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
+mgpsogui/gui/SetupTab/ListEditor.py
 mgpsogui/gui/SetupTab/ListParametersView.py
-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
 mgpsogui/gui/VisualizeTab/SideBar.py
 mgpsogui/gui/VisualizeTab/VisualizeTab.py
 mgpsogui/gui/VisualizeTab/__init__.py
-mgpsogui/gui/images/IGOW 4 Logo.png
+mgpsogui/gui/defaults/__init__.py
+mgpsogui/gui/defaults/optimization.json
+mgpsogui/gui/defaults/sampling.json
+mgpsogui/gui/defaults/sensitivity.json
 mgpsogui/gui/images/collapse.png
 mgpsogui/gui/images/down.png
 mgpsogui/gui/images/expand.png
 mgpsogui/gui/images/play.png
+mgpsogui/gui/images/plus.png
 mgpsogui/gui/images/refresh.png
 mgpsogui/gui/images/refresh_hd.png
 mgpsogui/gui/images/stop.png
@@ -42,12 +53,24 @@ mgpsogui/gui/images/up.png
 mgpsogui/util/GraphGenerator.py
 mgpsogui/util/PSORunner.py
 mgpsogui/util/__init__.py
+mgpsogui/util/debug.py
+mgpsogui/util/helpers.py
+mgpsogui/util/sampler_test_driver.py
 mgpsogui/util/CTkToolTip/__init__.py
 mgpsogui/util/CTkToolTip/ctk_tooltip.py
 mgpsogui/util/recosu/__init__.py
 mgpsogui/util/recosu/pso/__init__.py
 mgpsogui/util/recosu/pso/csip_access.py
 mgpsogui/util/recosu/pso/pso.py
+mgpsogui/util/recosu/sampling/__init__.py
+mgpsogui/util/recosu/sampling/sample_trace_writer.py
+mgpsogui/util/recosu/sampling/sampler_task.py
+mgpsogui/util/recosu/sampling/sampling.py
+mgpsogui/util/recosu/sampling/halton/__init__.py
+mgpsogui/util/recosu/sampling/halton/halton.py
+mgpsogui/util/recosu/sampling/halton/prime.py
+mgpsogui/util/recosu/sampling/random/__init__.py
+mgpsogui/util/recosu/sampling/random/random_sampler.py
 mgpsogui/util/recosu/utils/__init__.py
 mgpsogui/util/recosu/utils/trace_writer.py
 mgpsogui/util/recosu/utils/utils.py

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

@@ -0,0 +1,110 @@
+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.key_values = self.option_manager.get_list(self.list_name)
+        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:
+            required = False
+            visual_name = "NONE"
+            if "required" in key_value_pair:
+                required = key_value_pair["required"].get()
+            if required and "visual_name" in key_value_pair:
+                visual_name = key_value_pair["visual_name"]
+
+            if visual_name != "NONE":
+                CTkLabel(self.containerFrame, text=visual_name.get()).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
+                #CTkEntry(self.containerFrame, state="disabled", textvariable=self.key_values[index]["visual_name"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
+            else:
+                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 and not required:
+                type_menu = CTkOptionMenu(self.containerFrame, variable=self.key_values[index]["type"], values=["integer", "float", "date", "boolean", "string"], width=20)
+                type_menu.grid(row=row, column=3, columnspan=1, padx=(0, 0), pady=(5, 5), sticky="ew")
+
+                dest_menu = CTkOptionMenu(self.containerFrame, variable=self.key_values[index]["destination"], values=["args", "kwargs", "conf", "options", "oh_strategy", "metainfo"], width=20)
+                dest_menu.grid(row=row, column=4, columnspan=1, padx=(0, 0), pady=(5, 5), sticky="ew")
+
+
+                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=5, columnspan=1, 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 = ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"]
+                    day_options = ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31"]
+                    
+                    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, variable=year, values=year_options, width=50, 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, variable=month, values=month_options, width=20, 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, variable=day, values=day_options, width=20, 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")